From 85c98d62cc8e826d553d3920fd42281d480837a7 Mon Sep 17 00:00:00 2001
From: Erwan Or <erwan.ounn.84@gmail.com>
Date: Wed, 25 Dec 2024 09:03:40 -0500
Subject: [PATCH] penumbra: update ecosystem tendermint/ibc crates

Continuation of #4963, into a release branch `v0.82.x` before tagging a
release candidate at that version and publishing the workspace using an
`alpha` version.

This handles the domain type change for upgradeable channels
(https://github.com/penumbra-zone/ibc-types/pull/84) smoothly. It makes
sure to write default values to the new fields, which avoids wire
protocol changes, and makes this PR non consensus/state breaking.

Includes substantial version changes to:

* tendermint-rs
* tonic #4400
* ibc-types #4682
* cnidarium #4956

---------

Co-authored-by: Richard Janis Goldschmidt <github@aberrat.io>
---
 .github/workflows/buf-pull-request.yml        |    1 -
 .github/workflows/rust.yml                    |    2 +-
 Cargo.lock                                    | 1935 +++++++++--------
 Cargo.toml                                    |   68 +-
 crates/bench/Cargo.toml                       |    2 +-
 crates/bin/pcli/Cargo.toml                    |    1 +
 crates/bin/pcli/src/command/query.rs          |   14 +-
 crates/bin/pclientd/src/lib.rs                |    2 +-
 crates/bin/pclientd/src/proxy.rs              |   66 +-
 crates/bin/pd/Cargo.toml                      |   12 +-
 crates/bin/pd/src/main.rs                     |   27 +-
 crates/cnidarium/Cargo.toml                   |   46 -
 crates/cnidarium/src/cache.rs                 |  125 --
 crates/cnidarium/src/delta.rs                 |  513 -----
 crates/cnidarium/src/escaped_byte_slice.rs    |   34 -
 crates/cnidarium/src/future.rs                |  763 -------
 .../src/gen/penumbra.cnidarium.v1.rs          |  815 -------
 .../src/gen/penumbra.cnidarium.v1.serde.rs    | 1433 ------------
 .../src/gen/penumbra.cnidarium.v1alpha1.rs    |  671 ------
 .../gen/penumbra.cnidarium.v1alpha1.serde.rs  | 1047 ---------
 .../src/gen/proto_descriptor.bin.no_lfs       |  Bin 102050 -> 0 bytes
 crates/cnidarium/src/lib.rs                   |   91 -
 crates/cnidarium/src/metrics.rs               |   33 -
 crates/cnidarium/src/read.rs                  |  247 ---
 crates/cnidarium/src/rpc.rs                   |  256 ---
 crates/cnidarium/src/snapshot.rs              |  558 -----
 .../cnidarium/src/snapshot/rocks_wrapper.rs   |   83 -
 crates/cnidarium/src/snapshot_cache.rs        |  228 --
 crates/cnidarium/src/storage.rs               |  611 ------
 crates/cnidarium/src/storage/temp.rs          |   43 -
 crates/cnidarium/src/store.rs                 |    2 -
 crates/cnidarium/src/store/multistore.rs      |  233 --
 crates/cnidarium/src/store/substore.rs        |  546 -----
 crates/cnidarium/src/tests.rs                 | 1468 -------------
 crates/cnidarium/src/tests/delta.rs           |  721 ------
 crates/cnidarium/src/utils.rs                 |   34 -
 crates/cnidarium/src/write.rs                 |   74 -
 crates/cnidarium/src/write_batch.rs           |   59 -
 crates/cnidarium/tests/migration.rs           | 1190 ----------
 crates/cnidarium/tests/substore_tests.rs      |  751 -------
 crates/cnidarium/tests/write_batch.rs         |  302 ---
 crates/core/app/Cargo.toml                    |    4 +-
 crates/core/app/src/rpc.rs                    |   48 +-
 crates/core/app/src/server/consensus.rs       |    5 +-
 crates/core/app/src/server/events.rs          |   27 +-
 crates/core/app/src/server/info.rs            |    2 +
 ...p_can_sweep_a_collection_of_small_notes.rs |    4 +-
 .../core/app/tests/common/ibc_tests/node.rs   |    5 +-
 .../app/tests/common/ibc_tests/relayer.rs     |   42 +-
 .../app/tests/mock_consensus_block_proving.rs |   11 +-
 .../view_server_can_be_served_on_localhost.rs |    4 +-
 crates/core/component/auction/Cargo.toml      |    2 +-
 .../msg_handler/channel_close_confirm.rs      |    1 +
 .../component/msg_handler/channel_open_ack.rs |    1 +
 .../msg_handler/channel_open_confirm.rs       |    1 +
 .../msg_handler/channel_open_init.rs          |    1 +
 .../component/msg_handler/channel_open_try.rs |    2 +
 .../core/component/ibc/src/component/rpc.rs   |    2 +-
 .../ibc/src/component/rpc/consensus_query.rs  |   30 +-
 .../core/component/shielded-pool/Cargo.toml   |    1 +
 .../src/component/rpc/bank_query.rs           |   22 +-
 crates/core/keys/src/symmetric.rs             |    1 -
 crates/crypto/proof-params/Cargo.toml         |    2 +-
 crates/misc/tct-visualize/Cargo.toml          |    4 +-
 .../tct-visualize/src/bin/tct-live-edit.rs    |    7 +-
 crates/misc/tct-visualize/src/live/view.rs    |   19 +-
 crates/proto/Cargo.toml                       |    3 +-
 crates/proto/src/box_grpc_svc.rs              |   11 +-
 crates/proto/src/event.rs                     |   25 +-
 crates/proto/src/gen/cosmos.app.v1alpha1.rs   |   19 +-
 crates/proto/src/gen/cosmos.auth.v1beta1.rs   |   27 +-
 crates/proto/src/gen/cosmos.bank.v1beta1.rs   |  303 +--
 .../proto/src/gen/cosmos.base.abci.v1beta1.rs |   69 +-
 .../src/gen/cosmos.base.query.v1beta1.rs      |   13 +-
 crates/proto/src/gen/cosmos.base.v1beta1.rs   |   13 +-
 .../src/gen/cosmos.crypto.multisig.v1beta1.rs |   13 +-
 crates/proto/src/gen/cosmos.tx.config.v1.rs   |    9 +-
 .../src/gen/cosmos.tx.signing.v1beta1.rs      |   50 +-
 crates/proto/src/gen/cosmos.tx.v1beta1.rs     |  316 +--
 crates/proto/src/gen/cosmos_proto.rs          |   19 +-
 crates/proto/src/gen/google.api.rs            |   20 +-
 .../src/gen/ibc.applications.transfer.v1.rs   |  101 +-
 crates/proto/src/gen/ibc.core.channel.v1.rs   |  133 +-
 crates/proto/src/gen/ibc.core.client.v1.rs    |  113 +-
 .../proto/src/gen/ibc.core.connection.v1.rs   |  101 +-
 crates/proto/src/gen/noble.forwarding.v1.rs   |  281 +--
 crates/proto/src/gen/penumbra.cnidarium.v1.rs |  815 -------
 .../src/gen/penumbra.cnidarium.v1.serde.rs    | 1433 ------------
 crates/proto/src/gen/penumbra.core.app.v1.rs  |  132 +-
 .../src/gen/penumbra.core.app.v1.serde.rs     |    3 +
 .../proto/src/gen/penumbra.core.asset.v1.rs   |   92 +-
 .../src/gen/penumbra.core.asset.v1.serde.rs   |    5 +
 .../gen/penumbra.core.component.auction.v1.rs |  237 +-
 ...enumbra.core.component.auction.v1.serde.rs |   10 +
 ...numbra.core.component.community_pool.v1.rs |  121 +-
 ...enumbra.core.component.compact_block.v1.rs |  164 +-
 ...a.core.component.compact_block.v1.serde.rs |    5 +
 .../src/gen/penumbra.core.component.dex.v1.rs |  747 ++++---
 .../penumbra.core.component.dex.v1.serde.rs   |   36 +
 ...enumbra.core.component.distributions.v1.rs |   21 +-
 ...a.core.component.distributions.v1.serde.rs |    1 +
 .../src/gen/penumbra.core.component.fee.v1.rs |  155 +-
 .../penumbra.core.component.fee.v1.serde.rs   |    8 +
 .../gen/penumbra.core.component.funding.v1.rs |   23 +-
 ...enumbra.core.component.funding.v1.serde.rs |    1 +
 .../penumbra.core.component.governance.v1.rs  |  614 +++---
 ...mbra.core.component.governance.v1.serde.rs |   39 +
 .../src/gen/penumbra.core.component.ibc.v1.rs |   75 +-
 .../penumbra.core.component.ibc.v1.serde.rs   |    4 +
 .../src/gen/penumbra.core.component.sct.v1.rs |  248 ++-
 .../penumbra.core.component.sct.v1.serde.rs   |   16 +
 ...enumbra.core.component.shielded_pool.v1.rs |  445 ++--
 ...a.core.component.shielded_pool.v1.serde.rs |   22 +
 .../gen/penumbra.core.component.stake.v1.rs   |  418 ++--
 .../penumbra.core.component.stake.v1.serde.rs |   35 +
 crates/proto/src/gen/penumbra.core.keys.v1.rs |   80 +-
 .../src/gen/penumbra.core.keys.v1.serde.rs    |   10 +
 crates/proto/src/gen/penumbra.core.num.v1.rs  |    9 +-
 .../src/gen/penumbra.core.num.v1.serde.rs     |    2 +
 .../src/gen/penumbra.core.transaction.v1.rs   |  197 +-
 .../gen/penumbra.core.transaction.v1.serde.rs |    5 +
 .../proto/src/gen/penumbra.core.txhash.v1.rs  |   13 +-
 .../src/gen/penumbra.core.txhash.v1.serde.rs  |    2 +
 .../gen/penumbra.crypto.decaf377_fmd.v1.rs    |    7 +-
 .../penumbra.crypto.decaf377_fmd.v1.serde.rs  |    1 +
 .../gen/penumbra.crypto.decaf377_frost.v1.rs  |   43 +-
 ...penumbra.crypto.decaf377_frost.v1.serde.rs |    4 +
 .../gen/penumbra.crypto.decaf377_rdsa.v1.rs   |   19 +-
 .../penumbra.crypto.decaf377_rdsa.v1.serde.rs |    3 +
 .../proto/src/gen/penumbra.crypto.tct.v1.rs   |   25 +-
 .../src/gen/penumbra.crypto.tct.v1.serde.rs   |    6 +
 .../src/gen/penumbra.custody.threshold.v1.rs  |  102 +-
 .../penumbra.custody.threshold.v1.serde.rs    |   11 +
 crates/proto/src/gen/penumbra.custody.v1.rs   |  174 +-
 .../src/gen/penumbra.custody.v1.serde.rs      |    2 +
 .../src/gen/penumbra.tools.summoning.v1.rs    |  160 +-
 .../gen/penumbra.tools.summoning.v1.serde.rs  |   22 +
 .../gen/penumbra.util.tendermint_proxy.v1.rs  |  196 +-
 ...penumbra.util.tendermint_proxy.v1.serde.rs |   25 +
 crates/proto/src/gen/penumbra.view.v1.rs      |  813 +++----
 .../proto/src/gen/penumbra.view.v1.serde.rs   |   24 +
 .../proto/src/gen/proto_descriptor.bin.no_lfs |  Bin 649637 -> 643923 bytes
 crates/proto/src/gen/tendermint.abci.rs       |  475 ++--
 crates/proto/src/gen/tendermint.crypto.rs     |   38 +-
 crates/proto/src/gen/tendermint.p2p.rs        |   27 +-
 crates/proto/src/gen/tendermint.types.rs      |  188 +-
 crates/proto/src/gen/tendermint.version.rs    |   15 +-
 crates/proto/src/lib.rs                       |    7 -
 .../proto/src/protobuf/tendermint_compat.rs   |   33 +-
 crates/test/mock-consensus/src/block.rs       |    2 +-
 crates/util/auto-https/Cargo.toml             |    4 +-
 crates/util/auto-https/src/lib.rs             |    1 -
 crates/util/tower-trace/src/lib.rs            |    2 +-
 crates/view/src/storage/sct.rs                |    7 +-
 crates/view/src/worker.rs                     |    2 +-
 flake.lock                                    |   29 +-
 rust-toolchain.toml                           |    2 +-
 tools/proto-compiler/Cargo.lock               |  426 ++--
 tools/proto-compiler/Cargo.toml               |   18 +-
 tools/proto-compiler/src/main.rs              |   48 +-
 tools/summonerd/src/main.rs                   |   17 +-
 tools/summonerd/src/web.rs                    |    6 +-
 162 files changed, 6338 insertions(+), 19883 deletions(-)
 delete mode 100644 crates/cnidarium/Cargo.toml
 delete mode 100644 crates/cnidarium/src/cache.rs
 delete mode 100644 crates/cnidarium/src/delta.rs
 delete mode 100644 crates/cnidarium/src/escaped_byte_slice.rs
 delete mode 100644 crates/cnidarium/src/future.rs
 delete mode 100644 crates/cnidarium/src/gen/penumbra.cnidarium.v1.rs
 delete mode 100644 crates/cnidarium/src/gen/penumbra.cnidarium.v1.serde.rs
 delete mode 100644 crates/cnidarium/src/gen/penumbra.cnidarium.v1alpha1.rs
 delete mode 100644 crates/cnidarium/src/gen/penumbra.cnidarium.v1alpha1.serde.rs
 delete mode 100644 crates/cnidarium/src/gen/proto_descriptor.bin.no_lfs
 delete mode 100644 crates/cnidarium/src/lib.rs
 delete mode 100644 crates/cnidarium/src/metrics.rs
 delete mode 100644 crates/cnidarium/src/read.rs
 delete mode 100644 crates/cnidarium/src/rpc.rs
 delete mode 100644 crates/cnidarium/src/snapshot.rs
 delete mode 100644 crates/cnidarium/src/snapshot/rocks_wrapper.rs
 delete mode 100644 crates/cnidarium/src/snapshot_cache.rs
 delete mode 100644 crates/cnidarium/src/storage.rs
 delete mode 100644 crates/cnidarium/src/storage/temp.rs
 delete mode 100644 crates/cnidarium/src/store.rs
 delete mode 100644 crates/cnidarium/src/store/multistore.rs
 delete mode 100644 crates/cnidarium/src/store/substore.rs
 delete mode 100644 crates/cnidarium/src/tests.rs
 delete mode 100644 crates/cnidarium/src/tests/delta.rs
 delete mode 100644 crates/cnidarium/src/utils.rs
 delete mode 100644 crates/cnidarium/src/write.rs
 delete mode 100644 crates/cnidarium/src/write_batch.rs
 delete mode 100644 crates/cnidarium/tests/migration.rs
 delete mode 100644 crates/cnidarium/tests/substore_tests.rs
 delete mode 100644 crates/cnidarium/tests/write_batch.rs
 delete mode 100644 crates/proto/src/gen/penumbra.cnidarium.v1.rs
 delete mode 100644 crates/proto/src/gen/penumbra.cnidarium.v1.serde.rs

diff --git a/.github/workflows/buf-pull-request.yml b/.github/workflows/buf-pull-request.yml
index 6772e52e04..ead2ad48f3 100644
--- a/.github/workflows/buf-pull-request.yml
+++ b/.github/workflows/buf-pull-request.yml
@@ -78,7 +78,6 @@ jobs:
           ./deployments/scripts/protobuf-codegen
           # https://github.com/penumbra-zone/penumbra/issues/3038#issuecomment-1722534133
           git checkout crates/proto/src/gen/proto_descriptor.bin.no_lfs
-          git checkout crates/cnidarium/src/gen/proto_descriptor.bin.no_lfs
           s="$(git status --porcelain)"
           if [[ -n "$s" ]]; then
               echo "ERROR: protobuf files must be regenerated and committed."
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index adb2aa0879..51c6e70b0c 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -48,7 +48,7 @@ jobs:
           fi
 
       - name: Run tests with nextest
-        run: cargo nextest run --release --features migration
+        run: cargo nextest run --release
         env:
           CARGO_TERM_COLOR: always
 
diff --git a/Cargo.lock b/Cargo.lock
index 89f30cbd4e..102c921b11 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -208,7 +208,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
 dependencies = [
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -220,8 +220,8 @@ checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
 dependencies = [
  "num-bigint",
  "num-traits",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -302,8 +302,8 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -366,7 +366,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71"
 dependencies = [
  "askama_shared",
- "proc-macro2 1.0.86",
+ "proc-macro2 1.0.92",
  "syn 1.0.109",
 ]
 
@@ -389,8 +389,8 @@ dependencies = [
  "nom",
  "num-traits",
  "percent-encoding",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "serde",
  "syn 1.0.109",
  "toml 0.5.11",
@@ -398,9 +398,9 @@ dependencies = [
 
 [[package]]
 name = "asn1-rs"
-version = "0.3.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33"
+checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048"
 dependencies = [
  "asn1-rs-derive",
  "asn1-rs-impl",
@@ -408,31 +408,31 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.61",
  "time",
 ]
 
 [[package]]
 name = "asn1-rs-derive"
-version = "0.1.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf"
+checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 1.0.109",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
  "synstructure",
 ]
 
 [[package]]
 name = "asn1-rs-impl"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
+checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 1.0.109",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -464,55 +464,56 @@ dependencies = [
 
 [[package]]
 name = "async-http-codec"
-version = "0.5.8"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc4f0600c43df768851edad95ad43119ebde70e2feec8e39b91f97c9b62029e"
+checksum = "096146020b08dbc4587685b0730a7ba905625af13c65f8028035cdfd69573c91"
 dependencies = [
  "anyhow",
  "futures",
- "http",
+ "http 1.2.0",
  "httparse",
  "log",
 ]
 
 [[package]]
 name = "async-io"
-version = "1.13.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
+checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
 dependencies = [
  "async-lock",
- "autocfg",
  "cfg-if",
  "concurrent-queue",
- "futures-lite 1.13.0",
- "log",
+ "futures-io",
+ "futures-lite",
  "parking",
  "polling",
- "rustix 0.37.27",
+ "rustix",
  "slab",
- "socket2 0.4.10",
- "waker-fn",
+ "tracing",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "async-lock"
-version = "2.8.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 2.5.3",
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "async-net"
-version = "1.8.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f"
+checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
 dependencies = [
  "async-io",
  "blocking",
- "futures-lite 1.13.0",
+ "futures-lite",
 ]
 
 [[package]]
@@ -532,9 +533,9 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -549,53 +550,27 @@ version = "0.1.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "async-web-client"
-version = "0.2.7"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3838368c36426d00ad882467ea2308b17eceee33a10d840c2c90fd0923ee3b7e"
+checksum = "37381fb4fad3cd9b579628c21a58f528ef029d1f072d10f16cb9431aa2236d29"
 dependencies = [
  "async-http-codec",
  "async-net",
- "async-ws",
  "futures",
  "futures-rustls",
- "gloo-net",
- "http",
- "js-sys",
+ "http 1.2.0",
  "lazy_static",
  "log",
- "rustls 0.21.12",
- "thiserror",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots 0.25.4",
-]
-
-[[package]]
-name = "async-ws"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b9363f44ce91e6425b719432e3ff359a803434af3e577754a07e5d9ddbeda4"
-dependencies = [
- "async-io",
- "base64 0.13.1",
- "futures",
- "futures-lite 1.13.0",
- "generic_static",
- "http",
- "log",
- "rand",
- "ring 0.16.20",
- "strum 0.24.1",
- "thiserror",
- "utf-8",
+ "rustls-pki-types",
+ "thiserror 1.0.61",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -639,21 +614,49 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
+[[package]]
+name = "aws-lc-rs"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdd82dba44d209fddb11c190e0a94b78651f95299598e472215667417a03ff1d"
+dependencies = [
+ "aws-lc-sys",
+ "mirai-annotations",
+ "paste",
+ "untrusted 0.7.1",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972"
+dependencies = [
+ "bindgen 0.69.4",
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+ "libc",
+ "paste",
+]
+
 [[package]]
 name = "axum"
-version = "0.6.20"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
  "async-trait",
  "axum-core",
- "bitflags 1.3.2",
  "bytes",
  "futures-util",
- "headers",
- "http",
- "http-body",
- "hyper",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.5.1",
+ "hyper-util",
  "itoa",
  "matchit",
  "memchr",
@@ -665,47 +668,80 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 1.0.2",
  "tokio",
- "tower",
+ "tower 0.5.2",
  "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
 name = "axum-core"
-version = "0.3.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
 dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http",
- "http-body",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "http-body-util",
  "mime",
+ "pin-project-lite",
  "rustversion",
+ "sync_wrapper 1.0.2",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-extra"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04"
+dependencies = [
+ "axum",
+ "axum-core",
+ "bytes",
+ "fastrand",
+ "futures-util",
+ "headers",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "mime",
+ "multer",
+ "pin-project-lite",
+ "serde",
+ "tower 0.5.2",
  "tower-layer",
  "tower-service",
 ]
 
 [[package]]
 name = "axum-server"
-version = "0.5.1"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447f28c85900215cc1bea282f32d4a2f22d55c5a300afdfbc661c8d6a632e063"
+checksum = "56bac90848f6a9393ac03c63c640925c4b7c8ca21654de40d53f55964667c7d8"
 dependencies = [
  "arc-swap",
  "bytes",
  "futures-util",
- "http",
- "http-body",
- "hyper",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.5.1",
+ "hyper-util",
  "pin-project-lite",
- "rustls 0.21.12",
- "rustls-pemfile 1.0.4",
+ "rustls 0.23.20",
+ "rustls-pemfile 2.2.0",
+ "rustls-pki-types",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.26.1",
+ "tower 0.4.13",
  "tower-service",
 ]
 
@@ -730,12 +766,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
-[[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.7"
@@ -795,12 +825,12 @@ dependencies = [
  "lazycell",
  "peeking_take_while",
  "prettyplease",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.68",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -815,12 +845,15 @@ dependencies = [
  "itertools 0.12.1",
  "lazy_static",
  "lazycell",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "log",
+ "prettyplease",
+ "proc-macro2 1.0.92",
+ "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.68",
+ "syn 2.0.90",
+ "which",
 ]
 
 [[package]]
@@ -843,18 +876,18 @@ dependencies = [
 
 [[package]]
 name = "bit-set"
-version = "0.5.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
 dependencies = [
  "bit-vec",
 ]
 
 [[package]]
 name = "bit-vec"
-version = "0.6.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
 
 [[package]]
 name = "bitflags"
@@ -963,7 +996,7 @@ dependencies = [
  "async-channel",
  "async-task",
  "futures-io",
- "futures-lite 2.3.0",
+ "futures-lite",
  "piper",
 ]
 
@@ -985,9 +1018,9 @@ checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
  "syn_derive",
 ]
 
@@ -1031,9 +1064,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 dependencies = [
  "serde",
 ]
@@ -1144,7 +1177,7 @@ dependencies = [
  "iana-time-zone",
  "num-traits",
  "serde",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1229,8 +1262,8 @@ checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
 dependencies = [
  "heck 0.4.1",
  "proc-macro-error 1.0.4",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -1243,9 +1276,20 @@ dependencies = [
  "os_str_bytes",
 ]
 
+[[package]]
+name = "cmake"
+version = "0.1.52"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "cnidarium"
-version = "0.81.0"
+version = "0.82.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f0060de634f1f7411ab7464f1021f48ffdeb72fd63cf19553035fa766563828"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1262,7 +1306,6 @@ dependencies = [
  "parking_lot",
  "pbjson",
  "pin-project",
- "proptest",
  "prost",
  "regex",
  "rocksdb",
@@ -1271,12 +1314,10 @@ dependencies = [
  "smallvec",
  "tempfile",
  "tendermint",
- "test-strategy",
  "tokio",
  "tokio-stream",
  "tonic",
  "tracing",
- "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -1342,8 +1383,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b103d85ca6e209388771bfb7aa6b68a7aeec4afbf6f0a0264bfbf50360e5212e"
 dependencies = [
  "crossterm",
- "strum 0.23.0",
- "strum_macros 0.23.1",
+ "strum",
+ "strum_macros",
  "unicode-width",
 ]
 
@@ -1409,6 +1450,19 @@ version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
+[[package]]
+name = "cosmos-sdk-proto"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "462e1f6a8e005acc8835d32d60cbd7973ed65ea2a8d8473830e675f050956427"
+dependencies = [
+ "informalsystems-pbjson",
+ "prost",
+ "serde",
+ "tendermint-proto",
+ "tonic",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.12"
@@ -1527,7 +1581,7 @@ dependencies = [
  "bitflags 1.3.2",
  "crossterm_winapi",
  "libc",
- "mio",
+ "mio 0.8.11",
  "parking_lot",
  "signal-hook",
  "signal-hook-mio",
@@ -1623,10 +1677,10 @@ checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "strsim 0.11.1",
- "syn 2.0.68",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1636,8 +1690,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
 dependencies = [
  "darling_core",
- "quote 1.0.36",
- "syn 2.0.68",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1690,7 +1744,7 @@ dependencies = [
  "decaf377",
  "proptest",
  "rand_core",
- "thiserror",
+ "thiserror 1.0.61",
 ]
 
 [[package]]
@@ -1717,7 +1771,7 @@ dependencies = [
  "hex",
  "proptest",
  "rand_core",
- "thiserror",
+ "thiserror 1.0.61",
  "zeroize",
  "zeroize_derive",
 ]
@@ -1736,7 +1790,7 @@ dependencies = [
  "hex",
  "rand_core",
  "serde",
- "thiserror",
+ "thiserror 1.0.61",
  "zeroize",
 ]
 
@@ -1753,9 +1807,9 @@ dependencies = [
 
 [[package]]
 name = "der-parser"
-version = "7.0.0"
+version = "9.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82"
+checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553"
 dependencies = [
  "asn1-rs",
  "displaydoc",
@@ -1781,8 +1835,8 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -1792,8 +1846,8 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a2c35ab6e03642397cdda1dd58abbc05d418aef8e36297f336d5aba060fe8df"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -1803,9 +1857,9 @@ version = "0.99.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1873,9 +1927,9 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1899,6 +1953,12 @@ version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
 [[package]]
 name = "dyn-clone"
 version = "1.0.17"
@@ -1939,7 +1999,7 @@ dependencies = [
  "rand_core",
  "serde",
  "sha2 0.9.9",
- "thiserror",
+ "thiserror 1.0.61",
  "zeroize",
 ]
 
@@ -2039,12 +2099,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c"
 
-[[package]]
-name = "event-listener"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
 [[package]]
 name = "event-listener"
 version = "5.3.1"
@@ -2062,7 +2116,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
 dependencies = [
- "event-listener 5.3.1",
+ "event-listener",
  "pin-project-lite",
 ]
 
@@ -2097,15 +2151,6 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.1.0"
@@ -2189,7 +2234,7 @@ checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
  "futures-core",
  "futures-sink",
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
@@ -2198,6 +2243,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -2239,7 +2290,7 @@ dependencies = [
  "rand_core",
  "serde",
  "serdect",
- "thiserror",
+ "thiserror 1.0.61",
  "visibility",
  "zeroize",
 ]
@@ -2327,28 +2378,16 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
-[[package]]
-name = "futures-lite"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-dependencies = [
- "fastrand 1.9.0",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
 [[package]]
 name = "futures-lite"
 version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
+ "fastrand",
  "futures-core",
+ "futures-io",
+ "parking",
  "pin-project-lite",
 ]
 
@@ -2358,19 +2397,20 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "futures-rustls"
-version = "0.24.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28"
+checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
 dependencies = [
  "futures-io",
- "rustls 0.21.12",
+ "rustls 0.23.20",
+ "rustls-pki-types",
 ]
 
 [[package]]
@@ -2428,8 +2468,8 @@ checksum = "784f84eebc366e15251c4a8c3acee82a6a6f427949776ecb88377362a9621738"
 dependencies = [
  "proc-macro-error 0.4.12",
  "proc-macro-hack",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -2444,15 +2484,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "generic_static"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28ccff179d8070317671db09aee6d20affc26e88c5394714553b04f509b43a60"
-dependencies = [
- "once_cell",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -2478,31 +2509,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
-[[package]]
-name = "gloo-net"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9902a044653b26b99f7e3693a42f171312d9be8b26b5697bd1e43ad1f8a35e10"
-dependencies = [
- "gloo-utils",
- "js-sys",
- "thiserror",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "gloo-utils"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "group"
 version = "0.13.0"
@@ -2525,8 +2531,27 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http",
- "indexmap 2.2.6",
+ "http 0.2.12",
+ "indexmap 2.7.0",
+ "slab",
+ "tokio",
+ "tokio-util 0.7.11",
+ "tracing",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.2.0",
+ "indexmap 2.7.0",
  "slab",
  "tokio",
  "tokio-util 0.7.11",
@@ -2583,6 +2608,15 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
+ "foldhash",
+]
+
 [[package]]
 name = "hashlink"
 version = "0.9.1"
@@ -2604,14 +2638,14 @@ dependencies = [
 
 [[package]]
 name = "headers"
-version = "0.3.9"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
+checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9"
 dependencies = [
  "base64 0.21.7",
  "bytes",
  "headers-core",
- "http",
+ "http 1.2.0",
  "httpdate",
  "mime",
  "sha1",
@@ -2619,11 +2653,11 @@ dependencies = [
 
 [[package]]
 name = "headers-core"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
+checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
 dependencies = [
- "http",
+ "http 1.2.0",
 ]
 
 [[package]]
@@ -2636,7 +2670,7 @@ dependencies = [
  "hash32",
  "rustc_version",
  "serde",
- "spin 0.9.8",
+ "spin",
  "stable_deref_trait",
 ]
 
@@ -2672,9 +2706,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
 [[package]]
 name = "hex"
@@ -2720,6 +2754,17 @@ dependencies = [
  "itoa",
 ]
 
+[[package]]
+name = "http"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "http-body"
 version = "0.4.6"
@@ -2727,15 +2772,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http",
+ "http 0.2.12",
  "pin-project-lite",
 ]
 
 [[package]]
-name = "http-range-header"
-version = "0.3.1"
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http 1.2.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "pin-project-lite",
+]
 
 [[package]]
 name = "httparse"
@@ -2763,28 +2825,49 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.29"
+version = "0.14.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.3.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.7",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
  "want",
 ]
 
+[[package]]
+name = "hyper"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2 0.4.7",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.24.2"
@@ -2792,36 +2875,77 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
- "http",
- "hyper",
+ "http 0.2.12",
+ "hyper 0.14.31",
  "rustls 0.21.12",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.24.1",
 ]
 
 [[package]]
-name = "hyper-timeout"
-version = "0.4.1"
+name = "hyper-rustls"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
- "hyper",
- "pin-project-lite",
+ "futures-util",
+ "http 1.2.0",
+ "hyper 1.5.1",
+ "hyper-util",
+ "rustls 0.23.20",
+ "rustls-native-certs 0.8.0",
+ "rustls-pki-types",
  "tokio",
- "tokio-io-timeout",
+ "tokio-rustls 0.26.1",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-timeout"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
+dependencies = [
+ "hyper 1.5.1",
+ "hyper-util",
+ "pin-project-lite",
+ "tokio",
+ "tower-service",
 ]
 
 [[package]]
 name = "hyper-tls"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
- "hyper",
+ "http-body-util",
+ "hyper 1.5.1",
+ "hyper-util",
  "native-tls",
  "tokio",
  "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "hyper 1.5.1",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -2849,12 +2973,13 @@ dependencies = [
 
 [[package]]
 name = "ibc-proto"
-version = "0.41.0"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4ee32b22d3b06f31529b956f4928e5c9a068d71e46cf6abfa19c31ca550553"
+checksum = "9b70f517162e74e2d35875b8b94bf4d1e45f2c69ef3de452dc855944455d33ca"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "bytes",
+ "cosmos-sdk-proto",
  "flex-error",
  "ics23",
  "informalsystems-pbjson",
@@ -2867,9 +2992,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-types"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba606d86e2015991f86a129935dbaeacd94beab72fb90a733c1b1ea76be708a2"
+checksum = "fd68e32f5bd94849131670d34e21b0fb66057e91bee8e451e7f4e216e71616d2"
 dependencies = [
  "ibc-types-core-channel",
  "ibc-types-core-client",
@@ -2885,9 +3010,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-types-core-channel"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fb64ef52086b727e5ae01da0e773f8ca9172ec1fd9d0aa1a79c0c2c610b17a"
+checksum = "c57da64f7e945e7443035275cc279e0176c988ea625968c2526706aafcff1766"
 dependencies = [
  "anyhow",
  "bytes",
@@ -2918,9 +3043,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-types-core-client"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4db9d4b136b9e84ccf581fec02bb9ebc4478ac0f145c526760ed4310b98741e7"
+checksum = "108a89f64ffa39e04a7e29de9d9824523c3164f8518927716be870ad8a7aedf9"
 dependencies = [
  "anyhow",
  "bytes",
@@ -2945,9 +3070,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-types-core-commitment"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e2c527e14707dd0b2c7e6e2f6f62b0655c83154ae3eb1504e441d9d8f454ac6"
+checksum = "8949e33fbb9c3f1ae49588f4829977e80439f3dfc1491b5a69492f5e4a036949"
 dependencies = [
  "anyhow",
  "bytes",
@@ -2980,9 +3105,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-types-core-connection"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a8a326c00e9ba48059407478c826237fe39cc90dd2b47182484192926904fe7"
+checksum = "f63035288d11e5830daf20fd99507a671ab1cc03fa04752d75ef1c75e2786543"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3010,9 +3135,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-types-domain-type"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3abc9619b9dd7201804f45fc7f335dda72d2e4d6f82d96e8fe3abf4585e6101b"
+checksum = "c2c543a23a77a5d814e0aeffd5a918964468a8b213f664897bc3f8c50cc7d5c1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3021,9 +3146,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-types-identifier"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "405880cf06fef65f51c5c91b7efbdcbc8d7eba0ac16b43538b36ebd17f21edea"
+checksum = "b2ed2d7f06055bb2548564bf02c8c4b47561134f282adae61dc5c6ed722e1cde"
 dependencies = [
  "displaydoc",
  "serde",
@@ -3032,9 +3157,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-types-lightclients-tendermint"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab22446058bd5afa50d64f8519a9107bbc5101ee65373df896314f52afa0fc6"
+checksum = "00fd846b7eedca1dfbb7babeb55e0d74fb0d09a7db63da93737d54a581a96371"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3069,9 +3194,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-types-path"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a29e6fd8871fdced76402a3008219abf8773e527a46f120e0d76d6a3bb9706c1"
+checksum = "0f4da80e010427aff50f227920cdc8f7879469ce2db181cbcf92dc228172a334"
 dependencies = [
  "bytes",
  "derive_more",
@@ -3092,9 +3217,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-types-timestamp"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d2e763838dbef62ca8a1344b4dd5b3919d685b4c61874183724644c912237a"
+checksum = "748b2fbebe30ca799d31f6fc220d705b5180a608db842e29a3722671411d81a6"
 dependencies = [
  "bytes",
  "displaydoc",
@@ -3111,9 +3236,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-types-transfer"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad973ca1fbad8d0d1632ec0a329aecff8731bbb96395b7553d6b9fd749356d34"
+checksum = "8fcb46fe34a87db49bc9bb20918d7f882871a20d741d866d217c52a5dbe16a72"
 dependencies = [
  "displaydoc",
  "serde",
@@ -3134,9 +3259,9 @@ dependencies = [
 
 [[package]]
 name = "ics23"
-version = "0.11.3"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18798160736c1e368938ba6967dbcb3c7afb3256b442a5506ba5222eebb68a5a"
+checksum = "73b17f1a5bd7d12ad30a21445cfa5f52fd7651cb3243ba866f9916b1ec112f12"
 dependencies = [
  "anyhow",
  "blake2",
@@ -3206,8 +3331,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -3230,8 +3355,8 @@ checksum = "3a7d6e1419fa3129eb0802b4c99603c0d425c79fb5d76191d5a20d0ab0d664e8"
 dependencies = [
  "libflate",
  "proc-macro-hack",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -3264,12 +3389,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -3304,26 +3429,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.9.0"
@@ -3357,6 +3462,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -3365,9 +3479,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jmt"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a3bf1a303934c6f75533bd3a563730a0730f9361023c49ed6aee9fcb5b98f8"
+checksum = "bf2a10370b45cd850e64993ccd81d25ea2d4b5b0d0312546e7489fed82064f2e"
 dependencies = [
  "anyhow",
  "borsh",
@@ -3381,7 +3495,7 @@ dependencies = [
  "num-traits",
  "serde",
  "sha2 0.10.8",
- "thiserror",
+ "thiserror 1.0.61",
  "tracing",
 ]
 
@@ -3430,7 +3544,7 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
@@ -3441,9 +3555,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.168"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
 
 [[package]]
 name = "libflate"
@@ -3472,7 +3586,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3551,12 +3665,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@@ -3683,21 +3791,33 @@ dependencies = [
  "portable-atomic",
 ]
 
+[[package]]
+name = "metrics"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a7deb012b3b2767169ff203fadb4c6b0b82b947512e5eb9e0b78c2e186ad9e3"
+dependencies = [
+ "ahash",
+ "portable-atomic",
+]
+
 [[package]]
 name = "metrics-exporter-prometheus"
-version = "0.13.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21"
+checksum = "85b6f8152da6d7892ff1b7a1c0fa3f435e92b5918ad67035c3bb432111d9a29b"
 dependencies = [
- "base64 0.21.7",
- "hyper",
- "hyper-tls",
- "indexmap 2.2.6",
+ "base64 0.22.1",
+ "http-body-util",
+ "hyper 1.5.1",
+ "hyper-rustls 0.27.3",
+ "hyper-util",
+ "indexmap 2.7.0",
  "ipnet",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "metrics-util",
  "quanta",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
  "tracing",
 ]
@@ -3719,14 +3839,14 @@ dependencies = [
 
 [[package]]
 name = "metrics-tracing-context"
-version = "0.15.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb791d015f8947acf5a7f62bd28d00f289bb7ea98cfbe3ffec1d061eee12df12"
+checksum = "f1ada651cd6bdffe01e5f35067df53491f1fe853d2b154008ca2bd30b3d3fcf6"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.7.0",
  "itoa",
  "lockfree-object-pool",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "metrics-util",
  "once_cell",
  "tracing",
@@ -3736,17 +3856,16 @@ dependencies = [
 
 [[package]]
 name = "metrics-util"
-version = "0.16.3"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f"
+checksum = "15b482df36c13dd1869d73d14d28cd4855fbd6cfc32294bee109908a9f4a4ed7"
 dependencies = [
  "aho-corasick",
  "crossbeam-epoch",
  "crossbeam-utils",
- "hashbrown 0.14.5",
- "indexmap 2.2.6",
- "metrics 0.22.3",
- "num_cpus",
+ "hashbrown 0.15.2",
+ "indexmap 2.7.0",
+ "metrics 0.24.1",
  "ordered-float",
  "quanta",
  "radix_trie",
@@ -3796,12 +3915,40 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mio"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "mirai-annotations"
 version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1"
 
+[[package]]
+name = "multer"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b"
+dependencies = [
+ "bytes",
+ "encoding_rs",
+ "futures-util",
+ "http 1.2.0",
+ "httparse",
+ "memchr",
+ "mime",
+ "spin",
+ "version_check",
+]
+
 [[package]]
 name = "multimap"
 version = "0.10.0"
@@ -3921,8 +4068,8 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -3956,16 +4103,6 @@ dependencies = [
  "libm",
 ]
 
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
-]
-
 [[package]]
 name = "number_prefix"
 version = "0.4.0"
@@ -3989,9 +4126,9 @@ dependencies = [
 
 [[package]]
 name = "oid-registry"
-version = "0.4.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a"
+checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9"
 dependencies = [
  "asn1-rs",
 ]
@@ -4035,9 +4172,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -4100,8 +4237,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -4131,7 +4268,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.5.2",
  "smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4164,9 +4301,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pbjson"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90"
+checksum = "c7e6349fa080353f4a597daffd05cb81572a9c031a6d4fff7e504947496fcc68"
 dependencies = [
  "base64 0.21.7",
  "serde",
@@ -4174,21 +4311,21 @@ dependencies = [
 
 [[package]]
 name = "pbjson-build"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2580e33f2292d34be285c5bc3dba5259542b083cfad6037b6d70345f24dcb735"
+checksum = "6eea3058763d6e656105d1403cb04e0a41b7bbac6362d413e7c33be0c32279c9"
 dependencies = [
- "heck 0.4.1",
- "itertools 0.11.0",
+ "heck 0.5.0",
+ "itertools 0.13.0",
  "prost",
  "prost-types",
 ]
 
 [[package]]
 name = "pbjson-types"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12"
+checksum = "e54e5e7bfb1652f95bc361d76f3c780d8e526b134b85417e774166ee941f0887"
 dependencies = [
  "bytes",
  "chrono",
@@ -4235,6 +4372,7 @@ dependencies = [
  "bytes",
  "camino",
  "clap",
+ "cnidarium",
  "colored",
  "colored_json",
  "comfy-table",
@@ -4245,7 +4383,7 @@ dependencies = [
  "ed25519-consensus",
  "futures",
  "hex",
- "http-body",
+ "http-body 1.0.1",
  "humantime",
  "ibc-proto",
  "ibc-types",
@@ -4296,7 +4434,7 @@ dependencies = [
  "tokio-util 0.7.11",
  "toml 0.7.8",
  "tonic",
- "tower",
+ "tower 0.4.13",
  "tracing",
  "tracing-subscriber 0.3.18",
  "url",
@@ -4318,11 +4456,11 @@ dependencies = [
  "ed25519-consensus",
  "futures",
  "hex",
- "http",
- "http-body",
+ "http 1.2.0",
+ "http-body 1.0.1",
  "ibc-proto",
  "ibc-types",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "parking_lot",
  "penumbra-app",
  "penumbra-asset",
@@ -4348,7 +4486,7 @@ dependencies = [
  "tonic",
  "tonic-reflection",
  "tonic-web",
- "tower",
+ "tower 0.4.13",
  "tracing",
  "tracing-subscriber 0.3.18",
  "url",
@@ -4381,12 +4519,12 @@ dependencies = [
  "fs_extra",
  "futures",
  "hex",
- "http",
+ "http 1.2.0",
  "ibc-proto",
  "ibc-types",
  "ics23",
  "jmt",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "metrics-exporter-prometheus",
  "metrics-process",
  "metrics-tracing-context",
@@ -4425,7 +4563,7 @@ dependencies = [
  "rand_chacha",
  "rand_core",
  "regex",
- "reqwest",
+ "reqwest 0.12.9",
  "rocksdb",
  "serde",
  "serde_json",
@@ -4445,10 +4583,10 @@ dependencies = [
  "tonic",
  "tonic-reflection",
  "tonic-web",
- "tower",
+ "tower 0.4.13",
  "tower-abci",
  "tower-actor",
- "tower-http",
+ "tower-http 0.6.2",
  "tower-service",
  "tracing",
  "tracing-subscriber 0.3.18",
@@ -4479,8 +4617,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f241d42067ed3ab6a4fece1db720838e1418f36d868585a27931f95d6bc03582"
 dependencies = [
  "peg-runtime",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
 ]
 
 [[package]]
@@ -4491,11 +4629,12 @@ checksum = "e3aeb8f54c078314c2065ee649a7241f46b9d8e418e1a9581ba0546657d7aa3a"
 
 [[package]]
 name = "pem"
-version = "1.1.1"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
+checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.22.1",
+ "serde",
 ]
 
 [[package]]
@@ -4535,7 +4674,7 @@ dependencies = [
  "ics23",
  "im",
  "jmt",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "once_cell",
  "parking_lot",
  "penumbra-asset",
@@ -4586,10 +4725,10 @@ dependencies = [
  "tonic",
  "tonic-reflection",
  "tonic-web",
- "tower",
+ "tower 0.4.13",
  "tower-abci",
  "tower-actor",
- "tower-http",
+ "tower-http 0.6.2",
  "tower-service",
  "tracing",
  "tracing-subscriber 0.3.18",
@@ -4632,7 +4771,7 @@ dependencies = [
  "serde_json",
  "serde_with",
  "sha2 0.10.8",
- "thiserror",
+ "thiserror 1.0.61",
  "tracing",
 ]
 
@@ -4661,7 +4800,7 @@ dependencies = [
  "futures",
  "hex",
  "im",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "once_cell",
  "pbjson-types",
  "penumbra-asset",
@@ -4698,7 +4837,7 @@ dependencies = [
  "anyhow",
  "axum-server",
  "futures",
- "rustls 0.21.12",
+ "rustls 0.23.20",
  "rustls-acme",
  "tracing",
 ]
@@ -4740,7 +4879,7 @@ dependencies = [
  "rand",
  "rand_core",
  "regex",
- "reqwest",
+ "reqwest 0.12.9",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -4760,7 +4899,7 @@ dependencies = [
  "cnidarium-component",
  "futures",
  "hex",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "once_cell",
  "pbjson-types",
  "penumbra-asset",
@@ -4793,7 +4932,7 @@ dependencies = [
  "decaf377-rdsa",
  "futures",
  "im",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "penumbra-dex",
  "penumbra-fee",
  "penumbra-governance",
@@ -4876,7 +5015,7 @@ dependencies = [
  "hex",
  "im",
  "itertools 0.11.0",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "metrics-exporter-prometheus",
  "once_cell",
  "parking_lot",
@@ -4904,7 +5043,7 @@ dependencies = [
  "tap",
  "tendermint",
  "tendermint-light-client-verifier",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
  "tokio-stream",
  "tonic",
@@ -4944,7 +5083,7 @@ dependencies = [
  "proptest",
  "rand",
  "rand_core",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
 ]
 
@@ -4963,7 +5102,7 @@ dependencies = [
  "decaf377-rdsa",
  "getrandom",
  "im",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "penumbra-asset",
  "penumbra-num",
  "penumbra-proto",
@@ -4984,7 +5123,7 @@ dependencies = [
  "cnidarium",
  "cnidarium-component",
  "futures",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "penumbra-asset",
  "penumbra-community-pool",
  "penumbra-distributions",
@@ -5021,7 +5160,7 @@ dependencies = [
  "futures",
  "ibc-types",
  "im",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "once_cell",
  "pbjson-types",
  "penumbra-asset",
@@ -5046,7 +5185,7 @@ dependencies = [
  "serde_json",
  "tap",
  "tendermint",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
  "tonic",
  "tracing",
@@ -5067,7 +5206,7 @@ dependencies = [
  "ibc-proto",
  "ibc-types",
  "ics23",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "num-traits",
  "once_cell",
  "pbjson-types",
@@ -5085,7 +5224,7 @@ dependencies = [
  "time",
  "tokio",
  "tonic",
- "tower",
+ "tower 0.4.13",
  "tracing",
 ]
 
@@ -5132,7 +5271,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.8",
- "thiserror",
+ "thiserror 1.0.61",
  "tracing",
 ]
 
@@ -5187,7 +5326,7 @@ dependencies = [
  "tap",
  "tendermint",
  "tendermint-proto",
- "tower",
+ "tower 0.4.13",
  "tracing",
 ]
 
@@ -5239,7 +5378,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.8",
- "thiserror",
+ "thiserror 1.0.61",
  "tracing",
 ]
 
@@ -5281,7 +5420,7 @@ dependencies = [
  "rand",
  "rand_core",
  "regex",
- "reqwest",
+ "reqwest 0.12.9",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -5329,7 +5468,8 @@ dependencies = [
  "decaf377-rdsa",
  "futures",
  "hex",
- "http-body",
+ "http-body 1.0.1",
+ "http-body-util",
  "ibc-proto",
  "ibc-types",
  "ics23",
@@ -5343,9 +5483,9 @@ dependencies = [
  "tendermint",
  "tendermint-proto",
  "tendermint-rpc",
- "thiserror",
+ "thiserror 1.0.61",
  "tonic",
- "tower",
+ "tower 0.4.13",
  "tracing",
 ]
 
@@ -5370,7 +5510,7 @@ dependencies = [
  "getrandom",
  "hex",
  "im",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "once_cell",
  "pbjson-types",
  "penumbra-keys",
@@ -5413,7 +5553,7 @@ dependencies = [
  "ibc-proto",
  "ibc-types",
  "im",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "once_cell",
  "penumbra-asset",
  "penumbra-ibc",
@@ -5434,7 +5574,7 @@ dependencies = [
  "serde_json",
  "tap",
  "tendermint",
- "thiserror",
+ "thiserror 1.0.61",
  "tonic",
  "tracing",
 ]
@@ -5464,7 +5604,7 @@ dependencies = [
  "getrandom",
  "hex",
  "im",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "once_cell",
  "penumbra-asset",
  "penumbra-distributions",
@@ -5520,7 +5660,7 @@ dependencies = [
  "serde",
  "serde_json",
  "static_assertions",
- "thiserror",
+ "thiserror 1.0.61",
  "tracing",
 ]
 
@@ -5542,6 +5682,7 @@ version = "0.81.0"
 dependencies = [
  "anyhow",
  "axum",
+ "axum-extra",
  "axum-server",
  "bytes",
  "clap",
@@ -5562,7 +5703,7 @@ dependencies = [
  "tokio-stream",
  "tokio-util 0.7.11",
  "tonic",
- "tower-http",
+ "tower-http 0.6.2",
  "tracing-subscriber 0.3.18",
 ]
 
@@ -5574,8 +5715,8 @@ dependencies = [
  "chrono",
  "futures",
  "hex",
- "http",
- "metrics 0.22.3",
+ "http 1.2.0",
+ "metrics 0.24.1",
  "pbjson-types",
  "penumbra-proto",
  "penumbra-transaction",
@@ -5592,7 +5733,7 @@ dependencies = [
  "tokio-stream",
  "tokio-util 0.7.11",
  "tonic",
- "tower",
+ "tower 0.4.13",
  "tower-service",
  "tracing",
  "url",
@@ -5612,7 +5753,7 @@ version = "0.81.0"
 dependencies = [
  "futures",
  "hex",
- "http",
+ "http 1.2.0",
  "pin-project",
  "pin-project-lite",
  "sha2 0.10.8",
@@ -5622,7 +5763,7 @@ dependencies = [
  "tokio-stream",
  "tokio-util 0.7.11",
  "tonic",
- "tower",
+ "tower 0.4.13",
  "tower-service",
  "tracing",
 ]
@@ -5677,7 +5818,7 @@ dependencies = [
  "serde_json",
  "sha2 0.10.8",
  "tendermint",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
  "tracing",
 ]
@@ -5712,7 +5853,7 @@ dependencies = [
  "genawaiter",
  "hex",
  "ibc-types",
- "metrics 0.22.3",
+ "metrics 0.24.1",
  "once_cell",
  "parking_lot",
  "pbjson-types",
@@ -5787,7 +5928,7 @@ dependencies = [
  "serde_json",
  "tokio",
  "tonic",
- "tower",
+ "tower 0.4.13",
  "tracing",
 ]
 
@@ -5804,7 +5945,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.2.6",
+ "indexmap 2.7.0",
 ]
 
 [[package]]
@@ -5822,9 +5963,9 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5875,7 +6016,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
 dependencies = [
  "atomic-waker",
- "fastrand 2.1.0",
+ "fastrand",
  "futures-io",
 ]
 
@@ -5973,18 +6114,17 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "2.8.0"
+version = "3.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
+checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
 dependencies = [
- "autocfg",
- "bitflags 1.3.2",
  "cfg-if",
  "concurrent-queue",
- "libc",
- "log",
+ "hermit-abi 0.4.0",
  "pin-project-lite",
- "windows-sys 0.48.0",
+ "rustix",
+ "tracing",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6117,8 +6257,8 @@ version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
- "proc-macro2 1.0.86",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6149,8 +6289,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7"
 dependencies = [
  "proc-macro-error-attr 0.4.12",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
  "version_check",
 ]
@@ -6162,8 +6302,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr 1.0.4",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
  "version_check",
 ]
@@ -6174,8 +6314,8 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
  "syn-mid",
  "version_check",
@@ -6187,8 +6327,8 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "version_check",
 ]
 
@@ -6204,23 +6344,14 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "557facecbf90ff79faea80a08230d10c812016aa19198ed07d06de61f965b5cc"
 dependencies = [
- "unicode-xid 0.1.0",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid 0.1.0",
+ "unicode-xid",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -6235,7 +6366,7 @@ dependencies = [
  "hex",
  "lazy_static",
  "procfs-core",
- "rustix 0.38.34",
+ "rustix",
 ]
 
 [[package]]
@@ -6250,9 +6381,9 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
+checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
 dependencies = [
  "bit-set",
  "bit-vec",
@@ -6270,20 +6401,20 @@ dependencies = [
 
 [[package]]
 name = "proptest-derive"
-version = "0.3.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90b46295382dc76166cb7cf2bb4a97952464e4b7ed5a43e6cd34e1fec3349ddc"
+checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49"
 dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "syn 0.15.44",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "prost"
-version = "0.12.6"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
+checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -6291,13 +6422,12 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.12.6"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
+checksum = "d0f3e5beed80eb580c68e2c600937ac2c4eedabdfd5ef1e5b7ea4f3fba84497b"
 dependencies = [
- "bytes",
  "heck 0.5.0",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "log",
  "multimap",
  "once_cell",
@@ -6306,28 +6436,28 @@ dependencies = [
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.68",
+ "syn 2.0.90",
  "tempfile",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.12.6"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
+checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3"
 dependencies = [
  "anyhow",
- "itertools 0.12.1",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "itertools 0.13.0",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "prost-reflect"
-version = "0.13.1"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f5eec97d5d34bdd17ad2db2219aabf46b054c6c41bd5529767c9ce55be5898f"
+checksum = "20ae544fca2892fd4b7e9ff26cba1090cedf1d4d95c2aded1af15d2f93f270b8"
 dependencies = [
  "once_cell",
  "prost",
@@ -6336,9 +6466,9 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.12.6"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
+checksum = "cc2f1e56baa61e93533aebc21af4d2134b70f66275e0fcdf3cbe43d77ff7e8fc"
 dependencies = [
  "prost",
 ]
@@ -6364,22 +6494,13 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
- "proc-macro2 1.0.86",
+ "proc-macro2 1.0.92",
 ]
 
 [[package]]
@@ -6515,12 +6636,13 @@ dependencies = [
 
 [[package]]
 name = "rcgen"
-version = "0.10.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
+checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
 dependencies = [
+ "aws-lc-rs",
  "pem",
- "ring 0.16.20",
+ "rustls-pki-types",
  "time",
  "yasna",
 ]
@@ -6557,7 +6679,7 @@ checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
  "getrandom",
  "libredox 0.1.3",
- "thiserror",
+ "thiserror 1.0.61",
 ]
 
 [[package]]
@@ -6615,31 +6737,72 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-rustls",
- "hyper-tls",
+ "h2 0.3.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.31",
+ "hyper-rustls 0.24.2",
  "ipnet",
  "js-sys",
  "log",
  "mime",
- "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "rustls 0.21.12",
- "rustls-native-certs",
+ "rustls-native-certs 0.6.3",
  "rustls-pemfile 1.0.4",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
+ "sync_wrapper 0.1.2",
+ "system-configuration 0.5.1",
+ "tokio",
+ "tokio-rustls 0.24.1",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "encoding_rs",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2 0.4.7",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.5.1",
+ "hyper-rustls 0.27.3",
+ "hyper-tls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile 2.2.0",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 1.0.2",
+ "system-configuration 0.6.1",
  "tokio",
  "tokio-native-tls",
- "tokio-rustls",
  "tokio-util 0.7.11",
  "tower-service",
  "url",
@@ -6647,7 +6810,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "winreg",
+ "windows-registry",
 ]
 
 [[package]]
@@ -6660,21 +6823,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted 0.7.1",
- "web-sys",
- "winapi",
-]
-
 [[package]]
 name = "ring"
 version = "0.17.8"
@@ -6685,7 +6833,7 @@ dependencies = [
  "cfg-if",
  "getrandom",
  "libc",
- "spin 0.9.8",
+ "spin",
  "untrusted 0.9.0",
  "windows-sys 0.52.0",
 ]
@@ -6815,20 +6963,6 @@ dependencies = [
  "nom",
 ]
 
-[[package]]
-name = "rustix"
-version = "0.37.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.34"
@@ -6838,7 +6972,7 @@ dependencies = [
  "bitflags 2.6.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.14",
+ "linux-raw-sys",
  "windows-sys 0.52.0",
 ]
 
@@ -6849,19 +6983,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
- "ring 0.17.8",
+ "ring",
  "rustls-webpki 0.101.7",
  "sct",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.19"
+version = "0.23.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
+checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
 dependencies = [
+ "aws-lc-rs",
+ "log",
  "once_cell",
- "ring 0.17.8",
+ "ring",
  "rustls-pki-types",
  "rustls-webpki 0.102.8",
  "subtle",
@@ -6870,31 +7006,30 @@ dependencies = [
 
 [[package]]
 name = "rustls-acme"
-version = "0.7.7"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0e7754a9b89270815d1b119cdd35489380dc3598e24a952bf8a167c00b68b61"
+checksum = "54f05935c0b1d7c5981c40b768c5d5ed96a43f5cb5166f8f5be09779c5825697"
 dependencies = [
  "async-io",
  "async-trait",
  "async-web-client",
+ "aws-lc-rs",
  "axum-server",
- "base64 0.13.1",
+ "base64 0.22.1",
  "blocking",
  "chrono",
  "futures",
  "futures-rustls",
- "http",
+ "http 1.2.0",
  "log",
  "pem",
  "rcgen",
- "ring 0.16.20",
- "rustls 0.21.12",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 2.0.6",
  "tokio",
  "tokio-util 0.7.11",
- "webpki-roots 0.25.4",
+ "webpki-roots",
  "x509-parser",
 ]
 
@@ -6910,6 +7045,19 @@ dependencies = [
  "security-framework",
 ]
 
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile 2.2.0",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.4"
@@ -6940,7 +7088,7 @@ version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "ring 0.17.8",
+ "ring",
  "untrusted 0.9.0",
 ]
 
@@ -6950,7 +7098,8 @@ version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
- "ring 0.17.8",
+ "aws-lc-rs",
+ "ring",
  "rustls-pki-types",
  "untrusted 0.9.0",
 ]
@@ -7065,7 +7214,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "ring 0.17.8",
+ "ring",
  "untrusted 0.9.0",
 ]
 
@@ -7135,9 +7284,9 @@ version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7146,7 +7295,7 @@ version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.7.0",
  "itoa",
  "ryu",
  "serde",
@@ -7168,9 +7317,9 @@ version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7197,8 +7346,8 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f1b15838534b38fb67ffe60033fe3ffad48f916c175e8baa0400e0cdb958dec"
 dependencies = [
- "quote 1.0.36",
- "syn 2.0.68",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7223,7 +7372,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.2.6",
+ "indexmap 2.7.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -7238,9 +7387,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
 dependencies = [
  "darling",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7336,7 +7485,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
 dependencies = [
  "libc",
- "mio",
+ "mio 0.8.11",
  "signal-hook",
 ]
 
@@ -7377,9 +7526,9 @@ dependencies = [
 
 [[package]]
 name = "sketches-ddsketch"
-version = "0.2.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c"
+checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a"
 
 [[package]]
 name = "slab"
@@ -7399,16 +7548,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "socket2"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "socket2"
 version = "0.5.7"
@@ -7419,12 +7558,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -7481,7 +7614,7 @@ dependencies = [
  "crc",
  "crossbeam-queue",
  "either",
- "event-listener 5.3.1",
+ "event-listener",
  "futures-channel",
  "futures-core",
  "futures-intrusive",
@@ -7490,25 +7623,25 @@ dependencies = [
  "hashbrown 0.14.5",
  "hashlink",
  "hex",
- "indexmap 2.2.6",
+ "indexmap 2.7.0",
  "log",
  "memchr",
  "once_cell",
  "paste",
  "percent-encoding",
- "rustls 0.23.19",
+ "rustls 0.23.20",
  "rustls-pemfile 2.2.0",
  "serde",
  "serde_json",
  "sha2 0.10.8",
  "smallvec",
  "sqlformat",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
  "tokio-stream",
  "tracing",
  "url",
- "webpki-roots 0.26.7",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -7517,11 +7650,11 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.68",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7535,8 +7668,8 @@ dependencies = [
  "heck 0.5.0",
  "hex",
  "once_cell",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -7544,7 +7677,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.68",
+ "syn 2.0.90",
  "tempfile",
  "tokio",
  "url",
@@ -7589,7 +7722,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror",
+ "thiserror 1.0.61",
  "tracing",
  "whoami",
 ]
@@ -7630,7 +7763,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror",
+ "thiserror 1.0.61",
  "tracing",
  "whoami",
 ]
@@ -7694,44 +7827,12 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
-[[package]]
-name = "structmeta"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "structmeta-derive",
- "syn 2.0.68",
-]
-
-[[package]]
-name = "structmeta-derive"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
-]
-
 [[package]]
 name = "strum"
 version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb"
 
-[[package]]
-name = "strum"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
-dependencies = [
- "strum_macros 0.24.3",
-]
-
 [[package]]
 name = "strum_macros"
 version = "0.23.1"
@@ -7739,21 +7840,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38"
 dependencies = [
  "heck 0.3.3",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "rustversion",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "rustversion",
  "syn 1.0.109",
 ]
@@ -7796,7 +7884,7 @@ dependencies = [
  "decaf377",
  "futures",
  "hex",
- "http-body",
+ "http-body 1.0.1",
  "metrics-tracing-context",
  "penumbra-asset",
  "penumbra-keys",
@@ -7812,42 +7900,31 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tonic",
- "tower",
+ "tower 0.4.13",
  "tracing",
  "tracing-subscriber 0.3.18",
  "url",
 ]
 
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "unicode-xid 0.1.0",
-]
-
 [[package]]
 name = "syn"
 version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "unicode-ident",
 ]
 
@@ -7857,8 +7934,8 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea305d57546cc8cd04feb14b62ec84bf17f50e3f7b12560d7bfa9265f39d9ed"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -7869,9 +7946,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
 dependencies = [
  "proc-macro-error 1.0.4",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7880,16 +7957,24 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
 [[package]]
 name = "synstructure"
-version = "0.12.6"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 1.0.109",
- "unicode-xid 0.2.4",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7900,7 +7985,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
- "system-configuration-sys",
+ "system-configuration-sys 0.5.0",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation",
+ "system-configuration-sys 0.6.0",
 ]
 
 [[package]]
@@ -7913,6 +8009,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -7937,16 +8043,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
- "fastrand 2.1.0",
- "rustix 0.38.34",
+ "fastrand",
+ "rustix",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tendermint"
-version = "0.34.1"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15ab8f0a25d0d2ad49ac615da054d6a76aa6603ff95f7d18bafdd34450a1a04b"
+checksum = "d9703e34d940c2a293804752555107f8dbe2b84ec4c6dd5203831235868105d2"
 dependencies = [
  "bytes",
  "digest 0.10.7",
@@ -7957,7 +8063,6 @@ dependencies = [
  "num-traits",
  "once_cell",
  "prost",
- "prost-types",
  "serde",
  "serde_bytes",
  "serde_json",
@@ -7973,23 +8078,23 @@ dependencies = [
 
 [[package]]
 name = "tendermint-config"
-version = "0.34.1"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1a02da769166e2052cd537b1a97c78017632c2d9e19266367b27e73910434fc"
+checksum = "89cc3ea9a39b7ee34eefcff771cc067ecaa0c988c1c5ac08defd878471a06f76"
 dependencies = [
  "flex-error",
  "serde",
  "serde_json",
  "tendermint",
- "toml 0.5.11",
+ "toml 0.8.15",
  "url",
 ]
 
 [[package]]
 name = "tendermint-light-client-verifier"
-version = "0.34.1"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b8090d0eef9ad57b1b913b5e358e26145c86017e87338136509b94383a4af25"
+checksum = "f0cda4a449fc70985a95f892a67286f13afa4e048d90b8d04a2bf6341e88d1c2"
 dependencies = [
  "derive_more",
  "flex-error",
@@ -8000,16 +8105,13 @@ dependencies = [
 
 [[package]]
 name = "tendermint-proto"
-version = "0.34.1"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b797dd3d2beaaee91d2f065e7bdf239dc8d80bba4a183a288bc1279dd5a69a1e"
+checksum = "9ae9e1705aa0fa5ecb2c6aa7fb78c2313c4a31158ea5f02048bf318f849352eb"
 dependencies = [
  "bytes",
  "flex-error",
- "num-derive",
- "num-traits",
  "prost",
- "prost-types",
  "serde",
  "serde_bytes",
  "subtle-encoding",
@@ -8018,9 +8120,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint-rpc"
-version = "0.34.1"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71afae8bb5f6b14ed48d4e1316a643b6c2c3cbad114f510be77b4ed20b7b3e42"
+checksum = "835a52aa504c63ec05519e31348d3f4ba2fe79493c588e2cad5323d5e81b161a"
 dependencies = [
  "async-trait",
  "bytes",
@@ -8030,7 +8132,7 @@ dependencies = [
  "peg",
  "pin-project",
  "rand",
- "reqwest",
+ "reqwest 0.11.27",
  "semver",
  "serde",
  "serde_bytes",
@@ -8040,7 +8142,7 @@ dependencies = [
  "tendermint",
  "tendermint-config",
  "tendermint-proto",
- "thiserror",
+ "thiserror 1.0.61",
  "time",
  "tokio",
  "tracing",
@@ -8076,18 +8178,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
-[[package]]
-name = "test-strategy"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8361c808554228ad09bfed70f5c823caf8a3450b6881cc3a38eb57e8c08c1d9"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "structmeta",
- "syn 2.0.68",
-]
-
 [[package]]
 name = "textwrap"
 version = "0.16.1"
@@ -8100,7 +8190,16 @@ version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.61",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47"
+dependencies = [
+ "thiserror-impl 2.0.6",
 ]
 
 [[package]]
@@ -8109,9 +8208,20 @@ version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8182,43 +8292,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.38.0"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio",
- "num_cpus",
+ "mio 1.0.3",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.7",
+ "socket2",
  "tokio-macros",
  "tracing",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "tokio-io-timeout"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
-dependencies = [
- "pin-project-lite",
- "tokio",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8241,11 +8340,21 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
+dependencies = [
+ "rustls 0.23.20",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -8299,13 +8408,25 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.7.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
  "toml_edit 0.19.15",
 ]
 
+[[package]]
+name = "toml"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.16",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.6"
@@ -8321,11 +8442,11 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.7.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.40",
 ]
 
 [[package]]
@@ -8334,45 +8455,62 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.7.0",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
+dependencies = [
+ "indexmap 2.7.0",
+ "serde",
+ "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.20",
 ]
 
 [[package]]
 name = "tonic"
-version = "0.10.2"
-source = "git+https://github.com/penumbra-zone/tonic.git?tag=v0.10.3-penumbra#db355dd7029d1404ffa21639f596da58024364f0"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
 dependencies = [
  "async-stream",
  "async-trait",
  "axum",
- "base64 0.21.7",
+ "base64 0.22.1",
  "bytes",
- "h2",
- "http",
- "http-body",
- "hyper",
+ "h2 0.4.7",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.5.1",
  "hyper-timeout",
+ "hyper-util",
  "percent-encoding",
  "pin-project",
  "prost",
- "rustls 0.21.12",
- "rustls-pemfile 1.0.4",
+ "rustls-pemfile 2.2.0",
+ "socket2",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.26.1",
  "tokio-stream",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
  "tracing",
- "webpki-roots 0.25.4",
+ "webpki-roots",
 ]
 
 [[package]]
 name = "tonic-reflection"
-version = "0.10.2"
-source = "git+https://github.com/penumbra-zone/tonic.git?tag=v0.10.3-penumbra#db355dd7029d1404ffa21639f596da58024364f0"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "878d81f52e7fcfd80026b7fdb6a9b578b3c3653ba987f87f0dce4b64043cba27"
 dependencies = [
  "prost",
  "prost-types",
@@ -8383,18 +8521,19 @@ dependencies = [
 
 [[package]]
 name = "tonic-web"
-version = "0.10.2"
-source = "git+https://github.com/penumbra-zone/tonic.git?tag=v0.10.3-penumbra#db355dd7029d1404ffa21639f596da58024364f0"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5299dd20801ad736dccb4a5ea0da7376e59cd98f213bf1c3d478cf53f4834b58"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "bytes",
- "http",
- "http-body",
- "hyper",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "http-body-util",
  "pin-project",
  "tokio-stream",
  "tonic",
- "tower-http",
+ "tower-http 0.5.2",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -8421,11 +8560,27 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper 1.0.2",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "tower-abci"
-version = "0.11.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4826f3df3e9a37083d978cae73f020bcdf6143956b7dfc1bd6050b4e16367c"
+checksum = "4f3458c29aae68bfc21edc8482ee7ecce8e5dfbb0d07a8034f96fa304525391f"
 dependencies = [
  "bytes",
  "futures",
@@ -8436,7 +8591,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tokio-util 0.6.10",
- "tower",
+ "tower 0.4.13",
  "tracing",
 ]
 
@@ -8448,26 +8603,39 @@ checksum = "b882e5e82ee7440a08335f4d5a2edd9f7678b2cba73eac4826b53c22fd76fdd3"
 dependencies = [
  "futures",
  "pin-project",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
  "tokio-util 0.7.11",
- "tower",
+ "tower 0.4.13",
  "tracing",
 ]
 
 [[package]]
 name = "tower-http"
-version = "0.4.4"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
+checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
  "bitflags 2.6.0",
  "bytes",
- "futures-core",
- "futures-util",
- "http",
- "http-body",
- "http-range-header",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "pin-project-lite",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
+dependencies = [
+ "bitflags 2.6.0",
+ "bytes",
+ "http 1.2.0",
+ "http-body 1.0.1",
  "pin-project-lite",
  "tower-layer",
  "tower-service",
@@ -8476,15 +8644,15 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -8504,9 +8672,9 @@ version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8641,12 +8809,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
 [[package]]
 name = "unicode_categories"
 version = "0.1.1"
@@ -8687,12 +8849,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
 [[package]]
 name = "uuid"
 version = "1.9.1"
@@ -8728,9 +8884,9 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3fd98999db9227cf28e59d83e1f120f42bc233d4b152e8fab9bc87d5bb1e0f8"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8742,12 +8898,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "waker-fn"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
-
 [[package]]
 name = "walkdir"
 version = "2.5.0"
@@ -8798,9 +8948,9 @@ dependencies = [
  "bumpalo",
  "log",
  "once_cell",
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
  "wasm-bindgen-shared",
 ]
 
@@ -8822,7 +8972,7 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
- "quote 1.0.36",
+ "quote",
  "wasm-bindgen-macro-support",
 ]
 
@@ -8832,9 +8982,9 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -8868,12 +9018,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.25.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
-
 [[package]]
 name = "webpki-roots"
 version = "0.26.7"
@@ -8883,6 +9027,18 @@ dependencies = [
  "rustls-pki-types",
 ]
 
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
 [[package]]
 name = "whoami"
 version = "1.5.1"
@@ -8931,7 +9087,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
 dependencies = [
  "windows-core 0.57.0",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -8940,7 +9096,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -8951,8 +9107,8 @@ checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-result",
- "windows-targets 0.52.5",
+ "windows-result 0.1.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -8961,9 +9117,9 @@ version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8972,9 +9128,20 @@ version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result 0.2.0",
+ "windows-strings",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -8983,7 +9150,26 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result 0.2.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -9001,7 +9187,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -9021,18 +9216,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -9043,9 +9238,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -9055,9 +9250,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -9067,15 +9262,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -9085,9 +9280,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -9097,9 +9292,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -9109,9 +9304,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -9121,9 +9316,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
@@ -9134,6 +9329,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.50.0"
@@ -9155,19 +9359,18 @@ dependencies = [
 
 [[package]]
 name = "x509-parser"
-version = "0.13.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c"
+checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69"
 dependencies = [
  "asn1-rs",
- "base64 0.13.1",
  "data-encoding",
  "der-parser",
  "lazy_static",
  "nom",
  "oid-registry",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.61",
  "time",
 ]
 
@@ -9178,8 +9381,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
 dependencies = [
  "libc",
- "linux-raw-sys 0.4.14",
- "rustix 0.38.34",
+ "linux-raw-sys",
+ "rustix",
 ]
 
 [[package]]
@@ -9212,9 +9415,9 @@ version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -9232,9 +9435,9 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.36",
- "syn 2.0.68",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index bef547916b..cd86283743 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,6 @@ members = [
   "crates/bin/pd",
   "crates/bin/pindexer",
   "crates/bin/pmonitor",
-  "crates/cnidarium",
   "crates/cnidarium-component",
   "crates/core/app",
   "crates/core/asset",
@@ -123,8 +122,9 @@ ark-std                          = { default-features = false, version = "0.4" }
 assert_cmd                       = { version = "2.0" }
 async-stream                     = { version = "0.3.5" }
 async-trait                      = { version = "0.1.52" }
-axum                             = { version = "0.6" }
-axum-server                      = { version = "0.5" }
+axum                             = { version = "0.7.9" }
+axum-extra                       = { version = "0.9.6" }
+axum-server                      = { version = "0.7.1" }
 base64                           = { version = "0.21.2" }
 bech32                           = { version = "0.8.1" }
 bincode                          = { version = "1.3.3" }
@@ -135,7 +135,7 @@ camino                           = { version = "1" }
 chacha20poly1305                 = { version = "0.9.0" }
 chrono                           = { default-features = false, version = "0.4" }
 clap                             = { version = "3.2" }
-cnidarium                        = { default-features = false, path = "crates/cnidarium" }
+cnidarium                        = { version = "0.82", default-features = false}
 cnidarium-component              = { default-features = false, path = "crates/cnidarium-component" }
 cometindex                       = { path = "crates/util/cometindex" }
 criterion                        = { version = "0.4" }
@@ -149,25 +149,26 @@ ed25519-consensus                = { version = "2.1" }
 ethnum                           = { version = "1.3" }
 futures                          = { version = "0.3.28" }
 hex                              = { version = "0.4.3" }
-http                             = { version = "0.2.9" }
-http-body                        = { version = "0.4.5" }
+http                             = { version = "1.2.0" }
+http-body                        = { version = "1.0.1" }
+http-body-util                   = { version = "0.1.2" }
 humantime                        = { version = "2.1" }
-ibc-proto                        = { default-features = false, version = "0.41.0" }
-ibc-types                        = { default-features = false, version = "0.12.0" }
+ibc-proto                        = { default-features = false, version = "0.51.1" }
+ibc-types                        = { default-features = false, version = "0.15.0" }
 ibig                             = { version = "0.3" }
-ics23                            = { version = "0.11.3" }
+ics23                            = { version = "0.12.0" }
 im                               = { version = "^15.1.0" }
 indicatif                        = { version = "0.16" }
-jmt                              = { version = "0.10", features = ["migration"] }
-metrics                          = { version = "0.22" }
-metrics-exporter-prometheus      = { version = "0.13", features = ["http-listener"] }
-metrics-tracing-context          = { version = "0.15" }
+jmt                              = { version = "0.11", features = ["migration"] }
+metrics                          = { version = "0.24.1" }
+metrics-exporter-prometheus      = { version = "0.16", features = ["http-listener"] }
+metrics-tracing-context          = { version = "0.17.0" }
 num-bigint                       = { version = "0.4" }
 num-traits                       = { default-features = false, version = "0.2.15" }
 once_cell                        = { version = "1.8" }
 parking_lot                      = { version = "0.12.1" }
-pbjson                           = { version = "0.6" }
-pbjson-types                     = { version = "0.6.0" }
+pbjson                           = { version = "0.7.0" }
+pbjson-types                     = { version = "0.7.0" }
 penumbra-app                     = { default-features = false, path = "crates/core/app" }
 penumbra-asset                   = { default-features = false, path = "crates/core/asset" }
 penumbra-community-pool          = { default-features = false, path = "crates/core/component/community-pool" }
@@ -197,14 +198,13 @@ penumbra-transaction             = { default-features = false, path = "crates/co
 penumbra-txhash                  = { default-features = false, path = "crates/core/txhash" }
 penumbra-view                    = { path = "crates/view" }
 penumbra-wallet                  = { path = "crates/wallet" }
-penumbra-extension               = { path = "crates/penumbra-extension", default-features = false }
 pin-project                      = { version = "1.0.12" }
 pin-project-lite                 = { version = "0.2.9" }
 poseidon377                      = { version = "1.2.0" }
-proptest                         = { version = "1" }
-proptest-derive                  = { version = "0.3" }
-prost                            = { version = "0.12.3" }
-prost-types                      = { version = "0.12" }
+proptest                         = { version = "1.6" }
+proptest-derive                  = { version = "0.5.1" }
+prost                            = { version = "0.13.4" }
+prost-types                      = { version = "0.13.4" }
 r2d2                             = { version = "0.8" }
 r2d2_sqlite                      = { version = "0.25" }
 rand                             = { version = "0.8.5" }
@@ -220,33 +220,25 @@ sha2                             = { version = "0.10" }
 sqlx                             = { version = "0.8", features = ["bigdecimal", "postgres", "runtime-tokio", "tls-rustls"] }
 tap                              = "1.0.1"
 tempfile                         = { version = "3.3.0" }
-tendermint                       = { default-features = false, version = "0.34.0" }
-tendermint-config                = { version = "0.34.0" }
-tendermint-light-client-verifier = { version = "0.34.0" }
-tendermint-proto                 = { version = "0.34.0" }
-tendermint-rpc                   = { version = "0.34.0" }
+tendermint                       = { default-features = false, version = "0.40.1" }
+tendermint-config                = { version = "0.40.1" }
+tendermint-light-client-verifier = { version = "0.40.1" }
+tendermint-proto                 = { version = "0.40.1" }
+tendermint-rpc                   = { version = "0.40.1" }
 termion                          = { version = "3" }
 thiserror                        = { version = "1.0" }
 time                             = { version = "0.3" }
-tokio                            = { version = "1.3" }
+tokio                            = { version = "1.39.0" }
 tokio-stream                     = { version = "0.1.8" }
 tokio-util                       = { version = "0.7" }
 toml                             = { version = "0.7" }
-tonic                            = { version = "0.10" }
-tonic-reflection                 = { version = "0.10.0" }
-tonic-web                        = { version = "0.10.0" }
+tonic                            = { version = "0.12.3" }
+tonic-reflection                 = { version = "0.12.3" }
+tonic-web                        = { version = "0.12.3" }
 tower                            = { version = "0.4.0" }
-tower-http                       = { version = "0.4" }
+tower-http                       = { version = "0.6.2" }
 tower-service                    = { version = "0.3.2" }
 tracing                          = { version = "0.1" }
 tracing-subscriber               = { version = "0.3.17", features = ["env-filter"] }
 url                              = { version = "2.2" }
 getrandom                        = { version = "0.2", default-features = false }
-
-# TODO(kate):
-# temporarily point these dependencies to a tag in the penumbra-zone fork.
-# see #4392, #4400, and hyperium/tonic#1701 for more information.
-[patch.crates-io]
-tonic                            = { git = "https://github.com/penumbra-zone/tonic.git", tag = "v0.10.3-penumbra" }
-tonic-reflection                 = { git = "https://github.com/penumbra-zone/tonic.git", tag = "v0.10.3-penumbra" }
-tonic-web                        = { git = "https://github.com/penumbra-zone/tonic.git", tag = "v0.10.3-penumbra" }
diff --git a/crates/bench/Cargo.toml b/crates/bench/Cargo.toml
index dc68edfe71..ec8da243db 100644
--- a/crates/bench/Cargo.toml
+++ b/crates/bench/Cargo.toml
@@ -5,7 +5,7 @@ edition = {workspace = true}
 
 [build-dependencies]
 regex = { version = "1", optional = true }
-reqwest = { version = "0.11.14", optional = true, features = [
+reqwest = { version = "0.12.9", optional = true, features = [
     "blocking",
     "json",
 ] }
diff --git a/crates/bin/pcli/Cargo.toml b/crates/bin/pcli/Cargo.toml
index 7c123ddff9..520963891c 100644
--- a/crates/bin/pcli/Cargo.toml
+++ b/crates/bin/pcli/Cargo.toml
@@ -39,6 +39,7 @@ bincode = {workspace = true}
 blake2b_simd = {workspace = true}
 bytes = {workspace = true}
 camino = {workspace = true}
+cnidarium = {workspace = true, features = ["rpc"] }
 clap = {workspace = true, features = ["derive", "env"]}
 colored = "2.1.0"
 colored_json = "4.1"
diff --git a/crates/bin/pcli/src/command/query.rs b/crates/bin/pcli/src/command/query.rs
index 8fe1cfe66f..7851606792 100644
--- a/crates/bin/pcli/src/command/query.rs
+++ b/crates/bin/pcli/src/command/query.rs
@@ -13,12 +13,12 @@ mod validator;
 use auction::AuctionCmd;
 use base64::prelude::*;
 use chain::ChainCmd;
+use cnidarium::proto::v1::non_verifiable_key_value_request::Key as NVKey;
 use colored_json::ToColoredJson;
 use community_pool::CommunityPoolCmd;
 use dex::DexCmd;
 use governance::GovernanceCmd;
 use ibc_query::IbcCmd;
-use penumbra_proto::cnidarium::v1::non_verifiable_key_value_request::Key as NVKey;
 use shielded_pool::ShieldedPool;
 use tx::Tx;
 pub(super) use validator::ValidatorCmd;
@@ -177,7 +177,7 @@ impl QueryCmd {
             } => (key.clone(), storage_backend.clone()),
         };
 
-        use penumbra_proto::cnidarium::v1::query_service_client::QueryServiceClient;
+        use cnidarium::proto::v1::query_service_client::QueryServiceClient;
         let mut client = QueryServiceClient::new(app.pd_channel().await?);
 
         // Using an enum in the clap arguments was annoying; this is workable:
@@ -187,7 +187,7 @@ impl QueryCmd {
                     .decode(&key)
                     .map_err(|e| anyhow::anyhow!(format!("invalid base64: {}", e)))?;
 
-                let req = penumbra_proto::cnidarium::v1::NonVerifiableKeyValueRequest {
+                let req = cnidarium::proto::v1::NonVerifiableKeyValueRequest {
                     key: Some(NVKey { inner: key_bytes }),
                     ..Default::default()
                 };
@@ -205,7 +205,7 @@ impl QueryCmd {
             }
             // Default to JMT
             "jmt" | _ => {
-                let req = penumbra_proto::cnidarium::v1::KeyValueRequest {
+                let req = cnidarium::proto::v1::KeyValueRequest {
                     key: key.clone(),
                     // Command-line queries don't have a reason to include proofs as of now.
                     proof: false,
@@ -269,12 +269,10 @@ impl QueryCmd {
 // this code (not just this function, the whole module) is pretty shitty,
 // but that's maybe okay for the moment. it exists to consume the rpc.
 async fn watch(key_regex: String, nv_key_regex: String, app: &mut App) -> Result<()> {
-    use penumbra_proto::cnidarium::v1::{
-        query_service_client::QueryServiceClient, watch_response as wr,
-    };
+    use cnidarium::proto::v1::{query_service_client::QueryServiceClient, watch_response as wr};
     let mut client = QueryServiceClient::new(app.pd_channel().await?);
 
-    let req = penumbra_proto::cnidarium::v1::WatchRequest {
+    let req = cnidarium::proto::v1::WatchRequest {
         key_regex,
         nv_key_regex,
     };
diff --git a/crates/bin/pclientd/src/lib.rs b/crates/bin/pclientd/src/lib.rs
index 5b4be2f4b0..cf0bc5b979 100644
--- a/crates/bin/pclientd/src/lib.rs
+++ b/crates/bin/pclientd/src/lib.rs
@@ -344,7 +344,7 @@ impl Opt {
                             .register_encoded_file_descriptor_set(
                                 penumbra_proto::FILE_DESCRIPTOR_SET,
                             )
-                            .build()
+                            .build_v1()
                             .with_context(|| "could not configure grpc reflection service")?,
                     ))
                     .serve(config.bind_addr);
diff --git a/crates/bin/pclientd/src/proxy.rs b/crates/bin/pclientd/src/proxy.rs
index 7ae9bc2d85..1a9077f1f4 100644
--- a/crates/bin/pclientd/src/proxy.rs
+++ b/crates/bin/pclientd/src/proxy.rs
@@ -1,28 +1,19 @@
 use futures::FutureExt;
-use http_body::Body as _;
 use std::convert::Infallible;
 use std::pin::Pin;
 use std::{
     future::Future,
     task::{Context, Poll},
 };
-use tonic::transport::NamedService;
-use tonic::{
-    body::BoxBody,
-    transport::{Body, Channel},
-};
+use tonic::server::NamedService;
+use tonic::{body::BoxBody, transport::Channel};
 use tower::ServiceExt;
 
 fn proxy(
     channel: Channel,
-    req: http::Request<Body>,
+    req: http::Request<BoxBody>,
 ) -> Pin<Box<dyn Future<Output = Result<http::Response<BoxBody>, Infallible>> + Send + 'static>> {
     tracing::debug!(headers = ?req.headers(), "proxying request");
-    // Convert request types
-    let req = req.map(|b| {
-        b.map_err(|e| tonic::Status::from_error(Box::new(e)))
-            .boxed_unsync()
-    });
 
     let rsp = channel.oneshot(req);
 
@@ -30,11 +21,8 @@ fn proxy(
         // Once we get the response, we need to convert any transport errors into
         // an Ok(HTTP response reporting an internal error), so we can have Error = Infallible
         let rsp = match rsp.await {
-            Ok(rsp) => rsp.map(|b| {
-                b.map_err(|e| tonic::Status::from_error(Box::new(e)))
-                    .boxed_unsync()
-            }),
-            Err(e) => tonic::Status::internal(format!("grpc proxy error: {e}")).to_http(),
+            Ok(rsp) => rsp,
+            Err(e) => tonic::Status::internal(format!("grpc proxy error: {e}")).into_http(),
         };
         Ok::<_, Infallible>(rsp)
     }
@@ -48,7 +36,7 @@ impl NamedService for AppQueryProxy {
     const NAME: &'static str = "penumbra.core.app.v1.QueryService";
 }
 
-impl tower::Service<http::Request<Body>> for AppQueryProxy {
+impl tower::Service<http::Request<BoxBody>> for AppQueryProxy {
     type Response = http::Response<BoxBody>;
     type Error = Infallible;
     type Future =
@@ -58,7 +46,7 @@ impl tower::Service<http::Request<Body>> for AppQueryProxy {
         Poll::Ready(Ok(()))
     }
 
-    fn call(&mut self, req: http::Request<Body>) -> Self::Future {
+    fn call(&mut self, req: http::Request<BoxBody>) -> Self::Future {
         proxy(self.0.clone(), req)
     }
 }
@@ -70,7 +58,7 @@ impl NamedService for GovernanceQueryProxy {
     const NAME: &'static str = "penumbra.core.component.governance.v1.QueryService";
 }
 
-impl tower::Service<http::Request<Body>> for GovernanceQueryProxy {
+impl tower::Service<http::Request<BoxBody>> for GovernanceQueryProxy {
     type Response = http::Response<BoxBody>;
     type Error = Infallible;
     type Future =
@@ -80,7 +68,7 @@ impl tower::Service<http::Request<Body>> for GovernanceQueryProxy {
         Poll::Ready(Ok(()))
     }
 
-    fn call(&mut self, req: http::Request<Body>) -> Self::Future {
+    fn call(&mut self, req: http::Request<BoxBody>) -> Self::Future {
         proxy(self.0.clone(), req)
     }
 }
@@ -92,7 +80,7 @@ impl NamedService for DexQueryProxy {
     const NAME: &'static str = "penumbra.core.component.dex.v1.QueryService";
 }
 
-impl tower::Service<http::Request<Body>> for DexQueryProxy {
+impl tower::Service<http::Request<BoxBody>> for DexQueryProxy {
     type Response = http::Response<BoxBody>;
     type Error = Infallible;
     type Future =
@@ -102,7 +90,7 @@ impl tower::Service<http::Request<Body>> for DexQueryProxy {
         Poll::Ready(Ok(()))
     }
 
-    fn call(&mut self, req: http::Request<Body>) -> Self::Future {
+    fn call(&mut self, req: http::Request<BoxBody>) -> Self::Future {
         proxy(self.0.clone(), req)
     }
 }
@@ -114,7 +102,7 @@ impl NamedService for DexSimulationProxy {
     const NAME: &'static str = "penumbra.core.component.dex.v1.SimulationService";
 }
 
-impl tower::Service<http::Request<Body>> for DexSimulationProxy {
+impl tower::Service<http::Request<BoxBody>> for DexSimulationProxy {
     type Response = http::Response<BoxBody>;
     type Error = Infallible;
     type Future =
@@ -124,7 +112,7 @@ impl tower::Service<http::Request<Body>> for DexSimulationProxy {
         Poll::Ready(Ok(()))
     }
 
-    fn call(&mut self, req: http::Request<Body>) -> Self::Future {
+    fn call(&mut self, req: http::Request<BoxBody>) -> Self::Future {
         proxy(self.0.clone(), req)
     }
 }
@@ -136,7 +124,7 @@ impl NamedService for FeeQueryProxy {
     const NAME: &'static str = "penumbra.core.component.fee.v1.QueryService";
 }
 
-impl tower::Service<http::Request<Body>> for FeeQueryProxy {
+impl tower::Service<http::Request<BoxBody>> for FeeQueryProxy {
     type Response = http::Response<BoxBody>;
     type Error = Infallible;
     type Future =
@@ -146,7 +134,7 @@ impl tower::Service<http::Request<Body>> for FeeQueryProxy {
         Poll::Ready(Ok(()))
     }
 
-    fn call(&mut self, req: http::Request<Body>) -> Self::Future {
+    fn call(&mut self, req: http::Request<BoxBody>) -> Self::Future {
         proxy(self.0.clone(), req)
     }
 }
@@ -158,7 +146,7 @@ impl NamedService for SctQueryProxy {
     const NAME: &'static str = "penumbra.core.component.sct.v1.QueryService";
 }
 
-impl tower::Service<http::Request<Body>> for SctQueryProxy {
+impl tower::Service<http::Request<BoxBody>> for SctQueryProxy {
     type Response = http::Response<BoxBody>;
     type Error = Infallible;
     type Future =
@@ -168,7 +156,7 @@ impl tower::Service<http::Request<Body>> for SctQueryProxy {
         Poll::Ready(Ok(()))
     }
 
-    fn call(&mut self, req: http::Request<Body>) -> Self::Future {
+    fn call(&mut self, req: http::Request<BoxBody>) -> Self::Future {
         proxy(self.0.clone(), req)
     }
 }
@@ -180,7 +168,7 @@ impl NamedService for ShieldedPoolQueryProxy {
     const NAME: &'static str = "penumbra.core.component.shielded_pool.v1.QueryService";
 }
 
-impl tower::Service<http::Request<Body>> for ShieldedPoolQueryProxy {
+impl tower::Service<http::Request<BoxBody>> for ShieldedPoolQueryProxy {
     type Response = http::Response<BoxBody>;
     type Error = Infallible;
     type Future =
@@ -190,7 +178,7 @@ impl tower::Service<http::Request<Body>> for ShieldedPoolQueryProxy {
         Poll::Ready(Ok(()))
     }
 
-    fn call(&mut self, req: http::Request<Body>) -> Self::Future {
+    fn call(&mut self, req: http::Request<BoxBody>) -> Self::Future {
         proxy(self.0.clone(), req)
     }
 }
@@ -202,7 +190,7 @@ impl NamedService for ChainQueryProxy {
     const NAME: &'static str = "penumbra.core.component.chain.v1.QueryService";
 }
 
-impl tower::Service<http::Request<Body>> for ChainQueryProxy {
+impl tower::Service<http::Request<BoxBody>> for ChainQueryProxy {
     type Response = http::Response<BoxBody>;
     type Error = Infallible;
     type Future =
@@ -212,7 +200,7 @@ impl tower::Service<http::Request<Body>> for ChainQueryProxy {
         Poll::Ready(Ok(()))
     }
 
-    fn call(&mut self, req: http::Request<Body>) -> Self::Future {
+    fn call(&mut self, req: http::Request<BoxBody>) -> Self::Future {
         proxy(self.0.clone(), req)
     }
 }
@@ -224,7 +212,7 @@ impl NamedService for StakeQueryProxy {
     const NAME: &'static str = "penumbra.core.component.stake.v1.QueryService";
 }
 
-impl tower::Service<http::Request<Body>> for StakeQueryProxy {
+impl tower::Service<http::Request<BoxBody>> for StakeQueryProxy {
     type Response = http::Response<BoxBody>;
     type Error = Infallible;
     type Future =
@@ -234,7 +222,7 @@ impl tower::Service<http::Request<Body>> for StakeQueryProxy {
         Poll::Ready(Ok(()))
     }
 
-    fn call(&mut self, req: http::Request<Body>) -> Self::Future {
+    fn call(&mut self, req: http::Request<BoxBody>) -> Self::Future {
         proxy(self.0.clone(), req)
     }
 }
@@ -246,7 +234,7 @@ impl NamedService for CompactBlockQueryProxy {
     const NAME: &'static str = "penumbra.core.component.compact_block.v1.QueryService";
 }
 
-impl tower::Service<http::Request<Body>> for CompactBlockQueryProxy {
+impl tower::Service<http::Request<BoxBody>> for CompactBlockQueryProxy {
     type Response = http::Response<BoxBody>;
     type Error = Infallible;
     type Future =
@@ -256,7 +244,7 @@ impl tower::Service<http::Request<Body>> for CompactBlockQueryProxy {
         Poll::Ready(Ok(()))
     }
 
-    fn call(&mut self, req: http::Request<Body>) -> Self::Future {
+    fn call(&mut self, req: http::Request<BoxBody>) -> Self::Future {
         proxy(self.0.clone(), req)
     }
 }
@@ -268,7 +256,7 @@ impl NamedService for TendermintProxyProxy {
     const NAME: &'static str = "penumbra.util.tendermint_proxy.v1.TendermintProxyService";
 }
 
-impl tower::Service<http::Request<Body>> for TendermintProxyProxy {
+impl tower::Service<http::Request<BoxBody>> for TendermintProxyProxy {
     type Response = http::Response<BoxBody>;
     type Error = Infallible;
     type Future =
@@ -278,7 +266,7 @@ impl tower::Service<http::Request<Body>> for TendermintProxyProxy {
         Poll::Ready(Ok(()))
     }
 
-    fn call(&mut self, req: http::Request<Body>) -> Self::Future {
+    fn call(&mut self, req: http::Request<BoxBody>) -> Self::Future {
         proxy(self.0.clone(), req)
     }
 }
diff --git a/crates/bin/pd/Cargo.toml b/crates/bin/pd/Cargo.toml
index 79f0b127db..8831af8da6 100644
--- a/crates/bin/pd/Cargo.toml
+++ b/crates/bin/pd/Cargo.toml
@@ -28,7 +28,7 @@ anyhow                           = { workspace = true }
 ark-ff                           = { workspace = true, default-features = true }
 async-stream                     = { workspace = true }
 async-trait                      = { workspace = true }
-axum                             = "0.6"
+axum                             = { workspace = true, features = ["http2"] }
 axum-server                      = { workspace = true, features = ["tls-rustls"] }
 base64                           = { workspace = true }
 bincode                          = { workspace = true }
@@ -55,7 +55,7 @@ metrics                          = { workspace = true }
 metrics-exporter-prometheus      = { workspace = true }
 metrics-process                  = "2.0.0"
 metrics-tracing-context          = { workspace = true }
-metrics-util                     = "0.16.2"
+metrics-util                     = "0.18.0"
 mime_guess                       = "2"
 once_cell                        = { workspace = true }
 pbjson-types                     = { workspace = true }
@@ -87,7 +87,7 @@ rand                             = { workspace = true }
 rand_chacha                      = { workspace = true }
 rand_core                        = { workspace = true, features = ["getrandom"] }
 regex                            = { workspace = true }
-reqwest                          = { version = "0.11", features = ["json", "stream"] }
+reqwest                          = { version = "0.12.9", features = ["json", "stream"] }
 rocksdb                          = { workspace = true }
 serde                            = { workspace = true, features = ["derive"] }
 serde_json                       = { workspace = true }
@@ -108,9 +108,9 @@ tonic = { workspace = true }
 tonic-reflection = { workspace = true }
 tonic-web = { workspace = true }
 tower = { workspace = true, features = ["full"] }
-tower-abci = "0.11"
+tower-abci = "0.18"
 tower-actor = "0.1.0"
-tower-http = { workspace = true }
+tower-http = { workspace = true, features = ["cors", "trace"] }
 tower-service = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter", "ansi"] }
@@ -124,4 +124,4 @@ penumbra-proof-params = { workspace = true, features = [
 ], default-features = true }
 assert_cmd = { workspace = true }
 predicates = "2.1"
-prost-reflect = "0.13.1"
+prost-reflect = "0.14.3"
diff --git a/crates/bin/pd/src/main.rs b/crates/bin/pd/src/main.rs
index 59bca2cdbc..be7540df1e 100644
--- a/crates/bin/pd/src/main.rs
+++ b/crates/bin/pd/src/main.rs
@@ -21,10 +21,13 @@ use pd::{
 };
 use penumbra_app::app_version::check_and_update_app_version;
 use penumbra_app::{APP_VERSION, SUBSTORE_PREFIXES};
+use penumbra_tower_trace::remote_addr;
 use rand::Rng;
 use rand_core::OsRng;
 use tendermint_config::net::Address as TendermintAddress;
+use tower::ServiceBuilder;
 use tower_http::cors::CorsLayer;
+use tower_http::trace::TraceLayer;
 use tracing::Instrument as _;
 use tracing_subscriber::{prelude::*, EnvFilter};
 use url::Url;
@@ -129,15 +132,26 @@ async fn main() -> anyhow::Result<()> {
             );
 
             let tm_proxy = penumbra_tendermint_proxy::TendermintProxy::new(cometbft_addr);
-            let grpc_server = penumbra_app::rpc::router(&storage, tm_proxy, enable_expensive_rpc)?;
+
+            let grpc_routes = penumbra_app::rpc::routes(&storage, tm_proxy, enable_expensive_rpc)?
+                .into_axum_router()
+                .layer(
+                    ServiceBuilder::new().layer(TraceLayer::new_for_grpc().make_span_with(
+                        |req: &http::Request<_>| match remote_addr(req) {
+                            Some(remote_addr) => {
+                                tracing::error_span!("grpc", ?remote_addr)
+                            }
+                            None => tracing::error_span!("grpc"),
+                        },
+                    )),
+                );
 
             // Create Axum routes for the frontend app.
             let frontend = pd::zipserve::router("/app/", pd::MINIFRONT_ARCHIVE_BYTES);
             let node_status = pd::zipserve::router("/", pd::NODE_STATUS_ARCHIVE_BYTES);
 
             // Now we drop down a layer of abstraction, from tonic to axum, and merge handlers.
-            let router = grpc_server
-                .into_router()
+            let router = grpc_routes
                 .merge(frontend)
                 .merge(node_status)
                 // Set rather permissive CORS headers for pd's gRPC: the service
@@ -150,6 +164,13 @@ async fn main() -> anyhow::Result<()> {
             // Now start the GRPC server, initializing an ACME client to use as a certificate
             // resolver if auto-https has been enabled. if auto-https is not enabled, we will
             // instead spawn a future that will never return.
+
+            // TODO(janis): Is `axum_server::bind` sufficient to accept http1 (for grpc-web) and
+            // http2 (for grpc) requests?
+            //
+            // See also this (about axum::serve, suggesting that it just works out of the box; does that
+            // apply to axum_server::bind as well?)
+            // https://github.com/tokio-rs/axum/blob/c596deafe48ed608775e312eef7d12ddbb0fd424/examples/websockets-http2/src/main.rs#L57-L59
             let grpc_server = axum_server::bind(grpc_bind);
             let (grpc_server, acme_worker) = match grpc_auto_https {
                 Some(domain) => {
diff --git a/crates/cnidarium/Cargo.toml b/crates/cnidarium/Cargo.toml
deleted file mode 100644
index bd039898d7..0000000000
--- a/crates/cnidarium/Cargo.toml
+++ /dev/null
@@ -1,46 +0,0 @@
-[package]
-name = "cnidarium"
-version = {workspace = true}
-edition = {workspace = true}
-
-[features]
-migration = []
-migration-proptests = ["migration"]
-default = ["metrics"]
-rpc = ["dep:tonic", "dep:prost", "dep:serde", "dep:pbjson", "dep:ibc-proto"]
-
-[dependencies]
-anyhow = {workspace = true}
-async-trait = {workspace = true}
-base64 = {workspace = true}
-borsh = { version = "1.3.0" , features = ["derive", "de_strict_order"]}
-futures = {workspace = true}
-hex = {workspace = true}
-ibc-proto = {workspace = true, default-features = false, features = ["serde"], optional = true}
-ibc-types = {workspace = true, default-features = false, features = ["std"]}
-ics23 = {workspace = true}
-jmt = {workspace = true}
-metrics = {workspace = true, optional = true}
-once_cell = {workspace = true}
-parking_lot = {workspace = true}
-pbjson = {workspace = true, optional = true}
-pin-project = {workspace = true}
-prost = {workspace = true, optional = true}
-regex = {workspace = true}
-rocksdb = {workspace = true}
-serde = {workspace = true, optional = true}
-sha2 = {workspace = true}
-smallvec = { version = "1.10", features = ["union", "const_generics"] }
-tempfile = {workspace = true}
-tendermint = {workspace = true, default-features = false}
-tokio = {workspace = true, features = ["full", "tracing"]}
-tokio-stream = {workspace = true}
-tonic = {workspace = true, optional = true}
-tracing = {workspace = true}
-
-[dev-dependencies]
-tempfile = { workspace = true }
-tracing-subscriber = { workspace = true }
-tokio = { workspace = true, features = ["full", "rt-multi-thread"] }
-proptest = "1.3.1"
-test-strategy = "0.3.1"
diff --git a/crates/cnidarium/src/cache.rs b/crates/cnidarium/src/cache.rs
deleted file mode 100644
index f9817d7716..0000000000
--- a/crates/cnidarium/src/cache.rs
+++ /dev/null
@@ -1,125 +0,0 @@
-use std::{any::Any, collections::BTreeMap, sync::Arc};
-
-use tendermint::abci;
-
-use crate::{
-    store::{multistore::MultistoreConfig, substore::SubstoreConfig},
-    StateWrite,
-};
-
-/// A cache of changes to the state of the blockchain.
-///
-/// A [`StateDelta`](crate::StateDelta) is `Cache` above a `StateRead`.
-#[derive(Default, Debug)]
-pub struct Cache {
-    /// Unwritten changes to the consensus-critical state (stored in the JMT).
-    pub(crate) unwritten_changes: BTreeMap<String, Option<Vec<u8>>>,
-    /// Unwritten changes to non-consensus-critical state (stored in the nonverifiable storage).
-    pub(crate) nonverifiable_changes: BTreeMap<Vec<u8>, Option<Vec<u8>>>,
-    /// Unwritten changes to the object store.  A `None` value means a deletion.
-    pub(crate) ephemeral_objects: BTreeMap<&'static str, Option<Box<dyn Any + Send + Sync>>>,
-    /// A list of ABCI events that occurred while building this set of state changes.
-    pub(crate) events: Vec<abci::Event>,
-}
-
-impl Cache {
-    /// Inspect the cache of unwritten changes to the verifiable state.
-    pub fn unwritten_changes(&self) -> &BTreeMap<String, Option<Vec<u8>>> {
-        &self.unwritten_changes
-    }
-
-    /// Inspect the cache of unwritten changes to the nonverifiable state.
-    pub fn nonverifiable_changes(&self) -> &BTreeMap<Vec<u8>, Option<Vec<u8>>> {
-        &self.nonverifiable_changes
-    }
-
-    /// Merge the given cache with this one, taking its writes in place of ours.
-    pub fn merge(&mut self, other: Cache) {
-        // One might ask, why does this exist separately from `apply_to`?  The
-        // answer is that `apply_to` takes a `StateWrite`, so we'd have to have
-        // `Cache: StateWrite`, and that implies `Cache: StateRead`, but the
-        // `StateRead` trait assumes asynchronous access, and in any case, we
-        // probably don't want to be reading directly from a `Cache` (?)
-        self.unwritten_changes.extend(other.unwritten_changes);
-        self.nonverifiable_changes
-            .extend(other.nonverifiable_changes);
-        self.ephemeral_objects.extend(other.ephemeral_objects);
-        self.events.extend(other.events);
-    }
-
-    /// Consume this cache, applying its writes to the given state.
-    pub fn apply_to<S: StateWrite>(self, mut state: S) {
-        for (key, value) in self.unwritten_changes {
-            if let Some(value) = value {
-                state.put_raw(key, value);
-            } else {
-                state.delete(key);
-            }
-        }
-
-        for (key, value) in self.nonverifiable_changes {
-            if let Some(value) = value {
-                state.nonverifiable_put_raw(key, value);
-            } else {
-                state.nonverifiable_delete(key);
-            }
-        }
-
-        // It's important to use object_merge here, so that we don't re-box all
-        // of the objects, causing downcasting to fail.
-        state.object_merge(self.ephemeral_objects);
-
-        for event in self.events {
-            state.record(event);
-        }
-    }
-
-    /// Returns `true` if there are cached writes on top of the snapshot, and `false` otherwise.
-    pub fn is_dirty(&self) -> bool {
-        !(self.unwritten_changes.is_empty()
-            && self.nonverifiable_changes.is_empty()
-            && self.ephemeral_objects.is_empty())
-    }
-
-    /// Extracts and returns the ABCI events contained in this cache.
-    pub fn take_events(&mut self) -> Vec<abci::Event> {
-        std::mem::take(&mut self.events)
-    }
-
-    /// Consumes a `Cache` and returns a map of `SubstoreConfig` to `Cache` that
-    /// corresponds to changes belonging to each substore. The keys in each `Cache`
-    /// are truncated to remove the substore prefix.
-    pub fn shard_by_prefix(
-        self,
-        prefixes: &MultistoreConfig,
-    ) -> BTreeMap<Arc<SubstoreConfig>, Self> {
-        let mut changes_by_substore = BTreeMap::new();
-        for (key, some_value) in self.unwritten_changes.into_iter() {
-            let (truncated_key, substore_config) = prefixes.route_key_str(&key);
-            changes_by_substore
-                .entry(substore_config)
-                .or_insert_with(Cache::default)
-                .unwritten_changes
-                .insert(truncated_key.to_string(), some_value);
-        }
-
-        for (key, some_value) in self.nonverifiable_changes {
-            let (truncated_key, substore_config) = prefixes.route_key_bytes(&key);
-            changes_by_substore
-                .entry(substore_config)
-                .or_insert_with(Cache::default)
-                .nonverifiable_changes
-                .insert(truncated_key.to_vec(), some_value);
-        }
-        changes_by_substore
-    }
-
-    pub(crate) fn clone_changes(&self) -> Self {
-        Self {
-            unwritten_changes: self.unwritten_changes.clone(),
-            nonverifiable_changes: self.nonverifiable_changes.clone(),
-            ephemeral_objects: Default::default(),
-            events: Default::default(),
-        }
-    }
-}
diff --git a/crates/cnidarium/src/delta.rs b/crates/cnidarium/src/delta.rs
deleted file mode 100644
index 1abc12d77d..0000000000
--- a/crates/cnidarium/src/delta.rs
+++ /dev/null
@@ -1,513 +0,0 @@
-use std::{any::Any, sync::Arc};
-
-use futures::StreamExt;
-use parking_lot::RwLock;
-use tendermint::abci;
-
-use crate::{
-    future::{
-        CacheFuture, StateDeltaNonconsensusPrefixRawStream, StateDeltaNonconsensusRangeRawStream,
-        StateDeltaPrefixKeysStream, StateDeltaPrefixRawStream,
-    },
-    utils, Cache, EscapedByteSlice, StateRead, StateWrite,
-};
-
-/// An arbitrarily-deeply nested stack of delta updates to an underlying state.
-///
-/// This API allows exploring a tree of possible execution paths concurrently,
-/// before finally selecting one and applying it to the underlying state.
-///
-/// Using this API requires understanding its invariants.
-///
-/// On creation, `StateDelta::new` takes ownership of a `StateRead + StateWrite`
-/// instance, acquiring a "write lock" over the underlying state (since `&mut S`
-/// is `StateWrite` if `S: StateWrite`, it's possible to pass a unique
-/// reference).
-///
-/// The resulting `StateDelta` instance is a "leaf" state, and can be used for
-/// reads and writes, following the some execution path.
-///
-/// When two potential execution paths diverge, `delta.fork()` can be used to
-/// fork the state update.  The new forked `StateDelta` will include all
-/// previous state writes made to the original (and its ancestors).  Any writes
-/// made to the original `StateDelta` after `fork()` is called will not be seen
-/// by the forked state.
-///
-/// Finally, after some execution path has been selected, calling
-/// `delta.apply()` on one of the possible state updates will commit the changes
-/// to the underlying state instance, and invalidate all other delta updates in
-/// the same family.  It is a programming error to use the other delta updates
-/// after `apply()` has been called, but ideally this should not be a problem in
-/// practice: the API is intended to explore a tree of possible execution paths;
-/// once one has been selected, the others should be discarded.
-#[derive(Debug)]
-pub struct StateDelta<S: StateRead> {
-    /// The underlying state instance.
-    ///
-    /// The Arc<_> allows it to be shared between different stacks of delta updates,
-    /// and the RwLock<Option<_>> allows it to be taken out when it's time to commit
-    /// the changes from one of the stacks.
-    state: Arc<RwLock<Option<S>>>,
-    /// A stack of intermediate delta updates, with the "top" layers first.
-    ///
-    /// We store all the layers directly, rather than using a recursive structure,
-    /// so that the type doesn't depend on how many layers are involved. We're only
-    /// duplicating the Arc<_>, so this should be cheap.
-    layers: Vec<Arc<RwLock<Option<Cache>>>>,
-    /// The final delta update in the stack, the one we're currently working on.
-    /// Storing this separately allows us to avoid lock contention during writes.
-    /// In fact, this data shouldn't usually be shared at all; the only reason it's
-    /// wrapped this way is so that prefix streams can have 'static lifetimes.
-    /// We option-wrap it so it can be chained with the layers; it will never be None.
-    leaf_cache: Arc<RwLock<Option<Cache>>>,
-}
-
-impl<S: StateRead> StateDelta<S> {
-    /// Create a new tree of possible updates to an underlying `state`.
-    pub fn new(state: S) -> Self {
-        Self {
-            state: Arc::new(RwLock::new(Some(state))),
-            layers: Vec::default(),
-            leaf_cache: Arc::new(RwLock::new(Some(Cache::default()))),
-        }
-    }
-
-    /// Fork execution, returning a new child state that includes all previous changes.
-    pub fn fork(&mut self) -> Self {
-        // If we have writes in the leaf cache, we'll move them to a new layer,
-        // ensuring that the new child only sees writes made to this state
-        // *before* fork was called, and not after.
-        //
-        // Doing this only when the leaf cache is dirty means that we don't
-        // add empty layers in repeated fork() calls without intervening writes.
-        if self
-            .leaf_cache
-            .read()
-            .as_ref()
-            .expect("unable to get ref to leaf cache, storage not initialized?")
-            .is_dirty()
-        {
-            let new_layer = std::mem::replace(
-                &mut self.leaf_cache,
-                Arc::new(RwLock::new(Some(Cache::default()))),
-            );
-            self.layers.push(new_layer);
-        }
-
-        Self {
-            state: self.state.clone(),
-            layers: self.layers.clone(),
-            leaf_cache: Arc::new(RwLock::new(Some(Cache::default()))),
-        }
-    }
-
-    /// Flatten all changes in this branch of the tree into a single [`Cache`],
-    /// invalidating all other branches of the tree and releasing the underlying
-    /// state back to the caller.
-    ///
-    /// The [`apply`](Self::apply) method is a convenience wrapper around this
-    /// that applies the changes to the underlying state.
-    pub fn flatten(self) -> (S, Cache) {
-        tracing::trace!("flattening branch");
-        // Take ownership of the underlying state, immediately invalidating all
-        // other delta stacks in the same family.
-        let state = self
-            .state
-            .write()
-            .take()
-            .expect("apply must be called only once");
-
-        // Flatten the intermediate layers into a single cache, applying them from oldest
-        // (bottom) to newest (top), so that newer writes clobber old ones.
-        let mut changes = Cache::default();
-        for layer in self.layers {
-            let cache = layer
-                .write()
-                .take()
-                .expect("cache must not have already been applied");
-            changes.merge(cache);
-        }
-        // Last, apply the changes in the leaf cache.
-        changes.merge(
-            self.leaf_cache
-                .write()
-                .take()
-                .expect("unable to take leaf cache, was it already applied?"),
-        );
-
-        (state, changes)
-    }
-}
-
-impl<S: StateRead + StateWrite> StateDelta<S> {
-    /// Apply all changes in this branch of the tree to the underlying state,
-    /// releasing it back to the caller and invalidating all other branches of
-    /// the tree.
-    pub fn apply(self) -> (S, Vec<abci::Event>) {
-        let (mut state, mut changes) = self.flatten();
-        let events = changes.take_events();
-
-        // Apply the flattened changes to the underlying state.
-        changes.apply_to(&mut state);
-
-        // Finally, return ownership of the state back to the caller.
-        (state, events)
-    }
-}
-
-impl<S: StateRead + StateWrite> StateDelta<Arc<S>> {
-    pub fn try_apply(self) -> anyhow::Result<(S, Vec<abci::Event>)> {
-        let (arc_state, mut changes) = self.flatten();
-        let events = std::mem::take(&mut changes.events);
-
-        if let Ok(mut state) = Arc::try_unwrap(arc_state) {
-            // Apply the flattened changes to the underlying state.
-            changes.apply_to(&mut state);
-
-            // Finally, return ownership of the state back to the caller.
-            Ok((state, events))
-        } else {
-            Err(anyhow::anyhow!("did not have unique ownership of Arc<S>"))
-        }
-    }
-}
-
-impl<S: StateRead> StateRead for StateDelta<S> {
-    type GetRawFut = CacheFuture<S::GetRawFut>;
-    type PrefixRawStream = StateDeltaPrefixRawStream<S::PrefixRawStream>;
-    type PrefixKeysStream = StateDeltaPrefixKeysStream<S::PrefixKeysStream>;
-    type NonconsensusPrefixRawStream =
-        StateDeltaNonconsensusPrefixRawStream<S::NonconsensusPrefixRawStream>;
-    type NonconsensusRangeRawStream =
-        StateDeltaNonconsensusRangeRawStream<S::NonconsensusRangeRawStream>;
-
-    fn get_raw(&self, key: &str) -> Self::GetRawFut {
-        // Check if we have a cache hit in the leaf cache.
-        if let Some(entry) = self
-            .leaf_cache
-            .read()
-            .as_ref()
-            .expect("delta must not have been applied")
-            .unwritten_changes
-            .get(key)
-        {
-            return CacheFuture::hit(entry.clone());
-        }
-
-        // Iterate through the stack, top to bottom, to see if we have a cache hit.
-        for layer in self.layers.iter().rev() {
-            if let Some(entry) = layer
-                .read()
-                .as_ref()
-                .expect("delta must not have been applied")
-                .unwritten_changes
-                .get(key)
-            {
-                return CacheFuture::hit(entry.clone());
-            }
-        }
-
-        // If we got here, the key must be in the underlying state or not present at all.
-        CacheFuture::miss(
-            self.state
-                .read()
-                .as_ref()
-                .expect("delta must not have been applied")
-                .get_raw(key),
-        )
-    }
-
-    fn nonverifiable_get_raw(&self, key: &[u8]) -> Self::GetRawFut {
-        // Check if we have a cache hit in the leaf cache.
-        if let Some(entry) = self
-            .leaf_cache
-            .read()
-            .as_ref()
-            .expect("delta must not have been applied")
-            .nonverifiable_changes
-            .get(key)
-        {
-            return CacheFuture::hit(entry.clone());
-        }
-
-        // Iterate through the stack, top to bottom, to see if we have a cache hit.
-        for layer in self.layers.iter().rev() {
-            if let Some(entry) = layer
-                .read()
-                .as_ref()
-                .expect("delta must not have been applied")
-                .nonverifiable_changes
-                .get(key)
-            {
-                return CacheFuture::hit(entry.clone());
-            }
-        }
-
-        // If we got here, the key must be in the underlying state or not present at all.
-        CacheFuture::miss(
-            self.state
-                .read()
-                .as_ref()
-                .expect("delta must not have been applied")
-                .nonverifiable_get_raw(key),
-        )
-    }
-
-    fn object_type(&self, key: &'static str) -> Option<std::any::TypeId> {
-        // Check if we have a cache hit in the leaf cache.
-        if let Some(entry) = self
-            .leaf_cache
-            .read()
-            .as_ref()
-            .expect("delta must not have been applied")
-            .ephemeral_objects
-            .get(key)
-        {
-            // We have to explicitly call `Any::type_id(&**v)` here because this ensures that we are
-            // asking for the type of the `Any` *inside* the `Box<dyn Any>`, rather than the type of
-            // `Box<dyn Any>` itself.
-            return entry.as_ref().map(|v| std::any::Any::type_id(&**v));
-        }
-
-        // Iterate through the stack, top to bottom, to see if we have a cache hit.
-        for layer in self.layers.iter().rev() {
-            if let Some(entry) = layer
-                .read()
-                .as_ref()
-                .expect("delta must not have been applied")
-                .ephemeral_objects
-                .get(key)
-            {
-                // We have to explicitly call `Any::type_id(&**v)` here because this ensures that we are
-                // asking for the type of the `Any` *inside* the `Box<dyn Any>`, rather than the type of
-                // `Box<dyn Any>` itself.
-                return entry.as_ref().map(|v| std::any::Any::type_id(&**v));
-            }
-        }
-
-        // Fall through to the underlying store.
-        self.state
-            .read()
-            .as_ref()
-            .expect("delta must not have been applied")
-            .object_type(key)
-    }
-
-    fn object_get<T: std::any::Any + Send + Sync + Clone>(&self, key: &'static str) -> Option<T> {
-        // Check if we have a cache hit in the leaf cache.
-        if let Some(entry) = self
-            .leaf_cache
-            .read()
-            .as_ref()
-            .expect("delta must not have been applied")
-            .ephemeral_objects
-            .get(key)
-        {
-            return entry
-                .as_ref()
-                .map(|v| {
-                    v.downcast_ref().unwrap_or_else(|| panic!("unexpected type for key \"{key}\" in `StateDelta::object_get`: expected type {}", std::any::type_name::<T>()))
-                })
-                .cloned();
-        }
-
-        // Iterate through the stack, top to bottom, to see if we have a cache hit.
-        for layer in self.layers.iter().rev() {
-            if let Some(entry) = layer
-                .read()
-                .as_ref()
-                .expect("delta must not have been applied")
-                .ephemeral_objects
-                .get(key)
-            {
-                return entry
-                    .as_ref()
-                    .map(|v| {
-                    v.downcast_ref().unwrap_or_else(|| panic!("unexpected type for key \"{key}\" in `StateDelta::object_get`: expected type {}", std::any::type_name::<T>()))
-                }).cloned();
-            }
-        }
-
-        // Fall through to the underlying store.
-        self.state
-            .read()
-            .as_ref()
-            .expect("delta must not have been applied")
-            .object_get(key)
-    }
-
-    fn prefix_raw(&self, prefix: &str) -> Self::PrefixRawStream {
-        let underlying = self
-            .state
-            .read()
-            .as_ref()
-            .expect("delta must not have been applied")
-            .prefix_raw(prefix)
-            .peekable();
-        StateDeltaPrefixRawStream {
-            underlying,
-            layers: self.layers.clone(),
-            leaf_cache: self.leaf_cache.clone(),
-            last_key: None,
-            prefix: prefix.to_owned(),
-        }
-    }
-
-    fn prefix_keys(&self, prefix: &str) -> Self::PrefixKeysStream {
-        let underlying = self
-            .state
-            .read()
-            .as_ref()
-            .expect("delta must not have been applied")
-            .prefix_keys(prefix)
-            .peekable();
-        StateDeltaPrefixKeysStream {
-            underlying,
-            layers: self.layers.clone(),
-            leaf_cache: self.leaf_cache.clone(),
-            last_key: None,
-            prefix: prefix.to_owned(),
-        }
-    }
-
-    fn nonverifiable_prefix_raw(&self, prefix: &[u8]) -> Self::NonconsensusPrefixRawStream {
-        let underlying = self
-            .state
-            .read()
-            .as_ref()
-            .expect("delta must not have been applied")
-            .nonverifiable_prefix_raw(prefix)
-            .peekable();
-        StateDeltaNonconsensusPrefixRawStream {
-            underlying,
-            layers: self.layers.clone(),
-            leaf_cache: self.leaf_cache.clone(),
-            last_key: None,
-            prefix: prefix.to_vec(),
-        }
-    }
-
-    fn nonverifiable_range_raw(
-        &self,
-        prefix: Option<&[u8]>,
-        range: impl std::ops::RangeBounds<Vec<u8>>,
-    ) -> anyhow::Result<Self::NonconsensusRangeRawStream> {
-        let (range, (start, end)) = utils::convert_bounds(range)?;
-        let underlying = self
-            .state
-            .read()
-            .as_ref()
-            .expect("delta must not have been applied")
-            .nonverifiable_range_raw(prefix, range)?
-            .peekable();
-        Ok(StateDeltaNonconsensusRangeRawStream {
-            underlying,
-            layers: self.layers.clone(),
-            leaf_cache: self.leaf_cache.clone(),
-            last_key: None,
-            prefix: prefix.map(|p| p.to_vec()),
-            range: (start, end),
-        })
-    }
-}
-
-impl<S: StateRead> StateWrite for StateDelta<S> {
-    fn put_raw(&mut self, key: String, value: jmt::OwnedValue) {
-        self.leaf_cache
-            .write()
-            .as_mut()
-            .expect("delta must not have been applied")
-            .unwritten_changes
-            .insert(key, Some(value));
-    }
-
-    fn delete(&mut self, key: String) {
-        self.leaf_cache
-            .write()
-            .as_mut()
-            .expect("delta must not have been applied")
-            .unwritten_changes
-            .insert(key, None);
-    }
-
-    fn nonverifiable_delete(&mut self, key: Vec<u8>) {
-        tracing::trace!(key = ?EscapedByteSlice(&key), "deleting key");
-        self.leaf_cache
-            .write()
-            .as_mut()
-            .expect("delta must not have been applied")
-            .nonverifiable_changes
-            .insert(key, None);
-    }
-
-    fn nonverifiable_put_raw(&mut self, key: Vec<u8>, value: Vec<u8>) {
-        tracing::trace!(key = ?EscapedByteSlice(&key), value = ?EscapedByteSlice(&value), "insert nonverifiable change");
-        self.leaf_cache
-            .write()
-            .as_mut()
-            .expect("delta must not have been applied")
-            .nonverifiable_changes
-            .insert(key, Some(value));
-    }
-
-    fn object_put<T: Clone + Any + Send + Sync>(&mut self, key: &'static str, value: T) {
-        if let Some(previous_type) = self.object_type(key) {
-            if std::any::TypeId::of::<T>() != previous_type {
-                panic!(
-                    "unexpected type for key \"{key}\" in `StateDelta::object_put`: expected type {expected}",
-                    expected = std::any::type_name::<T>(),
-                );
-            }
-        }
-        self.leaf_cache
-            .write()
-            .as_mut()
-            .expect("delta must not have been applied")
-            .ephemeral_objects
-            .insert(key, Some(Box::new(value)));
-    }
-
-    fn object_delete(&mut self, key: &'static str) {
-        self.leaf_cache
-            .write()
-            .as_mut()
-            .expect("delta must not have been applied")
-            .ephemeral_objects
-            .insert(key, None);
-    }
-
-    fn object_merge(
-        &mut self,
-        objects: std::collections::BTreeMap<&'static str, Option<Box<dyn Any + Send + Sync>>>,
-    ) {
-        self.leaf_cache
-            .write()
-            .as_mut()
-            .expect("delta must not have been applied")
-            .ephemeral_objects
-            .extend(objects);
-    }
-
-    fn record(&mut self, event: abci::Event) {
-        self.leaf_cache
-            .write()
-            .as_mut()
-            .expect("delta must not have been applied")
-            .events
-            .push(event)
-    }
-}
-
-/// Extension trait providing `try_begin_transaction()` on `Arc<StateDelta<S>>`.
-pub trait ArcStateDeltaExt: Sized {
-    type S: StateRead;
-    /// Attempts to begin a transaction on this `Arc<State>`, returning `None` if the `Arc` is shared.
-    fn try_begin_transaction(&'_ mut self) -> Option<StateDelta<&'_ mut StateDelta<Self::S>>>;
-}
-
-impl<S: StateRead> ArcStateDeltaExt for Arc<StateDelta<S>> {
-    type S = S;
-    fn try_begin_transaction(&'_ mut self) -> Option<StateDelta<&'_ mut StateDelta<S>>> {
-        Arc::get_mut(self).map(StateDelta::new)
-    }
-}
diff --git a/crates/cnidarium/src/escaped_byte_slice.rs b/crates/cnidarium/src/escaped_byte_slice.rs
deleted file mode 100644
index de75839642..0000000000
--- a/crates/cnidarium/src/escaped_byte_slice.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-/// A wrapper type for a byte slice that implements `Debug` by escaping
-/// non-printable bytes.
-///
-/// This is exposed as part of the public API for convenience of downstream
-/// users' debugging of state accesses.
-pub struct EscapedByteSlice<'a>(pub &'a [u8]);
-
-impl<'a> std::fmt::Debug for EscapedByteSlice<'a> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "b\"")?;
-        for &b in self.0 {
-            // https://doc.rust-lang.org/reference/tokens.html#byte-escapes
-            #[allow(clippy::manual_range_contains)]
-            if b == b'\n' {
-                write!(f, "\\n")?;
-            } else if b == b'\r' {
-                write!(f, "\\r")?;
-            } else if b == b'\t' {
-                write!(f, "\\t")?;
-            } else if b == b'\\' || b == b'"' {
-                write!(f, "\\{}", b as char)?;
-            } else if b == b'\0' {
-                write!(f, "\\0")?;
-            // ASCII printable
-            } else if b >= 0x20 && b < 0x7f {
-                write!(f, "{}", b as char)?;
-            } else {
-                write!(f, "\\x{:02x}", b)?;
-            }
-        }
-        write!(f, "\"")?;
-        Ok(())
-    }
-}
diff --git a/crates/cnidarium/src/future.rs b/crates/cnidarium/src/future.rs
deleted file mode 100644
index b5858972e3..0000000000
--- a/crates/cnidarium/src/future.rs
+++ /dev/null
@@ -1,763 +0,0 @@
-//! Concrete futures types used by the storage crate.
-
-use anyhow::Result;
-use futures::{
-    future::{Either, Ready},
-    stream::Peekable,
-    Stream,
-};
-use parking_lot::RwLock;
-use pin_project::pin_project;
-use smallvec::SmallVec;
-use std::{
-    future::Future,
-    ops::Bound,
-    pin::Pin,
-    sync::Arc,
-    task::{ready, Context, Poll},
-};
-
-use crate::Cache;
-
-/// Future representing a read from a state snapshot.
-#[pin_project]
-pub struct SnapshotFuture(#[pin] pub(crate) tokio::task::JoinHandle<Result<Option<Vec<u8>>>>);
-
-impl Future for SnapshotFuture {
-    type Output = Result<Option<Vec<u8>>>;
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let this = self.project();
-        match this.0.poll(cx) {
-            Poll::Ready(result) => {
-                Poll::Ready(result.expect("unrecoverable join error from tokio task"))
-            }
-            Poll::Pending => Poll::Pending,
-        }
-    }
-}
-
-/// Future representing a read from an in-memory cache over an underlying state.
-#[pin_project]
-pub struct CacheFuture<F> {
-    #[pin]
-    inner: Either<Ready<Result<Option<Vec<u8>>>>, F>,
-}
-
-impl<F> CacheFuture<F> {
-    pub(crate) fn hit(value: Option<Vec<u8>>) -> Self {
-        Self {
-            inner: Either::Left(futures::future::ready(Ok(value))),
-        }
-    }
-
-    pub(crate) fn miss(underlying: F) -> Self {
-        Self {
-            inner: Either::Right(underlying),
-        }
-    }
-}
-
-impl<F> Future for CacheFuture<F>
-where
-    F: Future<Output = Result<Option<Vec<u8>>>>,
-{
-    type Output = Result<Option<Vec<u8>>>;
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let this = self.project();
-        this.inner.poll(cx)
-    }
-}
-
-#[pin_project]
-pub struct StateDeltaNonconsensusPrefixRawStream<St>
-where
-    St: Stream<Item = Result<(Vec<u8>, Vec<u8>)>>,
-{
-    #[pin]
-    pub(crate) underlying: Peekable<St>,
-    pub(crate) layers: Vec<Arc<RwLock<Option<Cache>>>>,
-    pub(crate) leaf_cache: Arc<RwLock<Option<Cache>>>,
-    pub(crate) last_key: Option<Vec<u8>>,
-    pub(crate) prefix: Vec<u8>,
-}
-
-impl<St> Stream for StateDeltaNonconsensusPrefixRawStream<St>
-where
-    St: Stream<Item = Result<(Vec<u8>, Vec<u8>)>>,
-{
-    type Item = Result<(Vec<u8>, Vec<u8>)>;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        // This implementation interleaves items from the underlying stream with
-        // items in cache layers.  To do this, it tracks the last key it
-        // returned, then, for each item in the underlying stream, searches for
-        // cached keys that lie between the last-returned key and the item's key,
-        // checking whether the cached key represents a deletion requiring further
-        // scanning.  This process is illustrated as follows:
-        //
-        //         ◇ skip                 ◇ skip           ▲ yield          ▲ yield           ▲ yield
-        //         │                      │                │                │                 │
-        //         ░ pick ──────────────▶ ░ pick ────────▶ █ pick ────────▶ █ pick ─────────▶ █ pick
-        //         ▲                      ▲                ▲                ▲                 ▲
-        //      ▲  │                 ▲    │          ▲     │         ▲      │        ▲        │
-        // write│  │                 │    │          │     │         │      │        │        │
-        // layer│  │   █             │    │ █        │     │█        │      █        │      █ │
-        //      │  │ ░               │    ░          │    ░│         │    ░          │    ░   │
-        //      │  ░                 │  ░            │  ░  │         │  ░            │  ░     │
-        //      │    █               │    █          │    █│         │    █          │    █   │
-        //      │  █     █           │  █     █      │  █  │  █      │  █     █      │  █     █
-        //      │     █              │     █         │     █         │     █         │     █
-        //     ─┼(─────]────keys─▶  ─┼──(───]────▶  ─┼────(─]────▶  ─┼─────(]────▶  ─┼──────(──]─▶
-        //      │   ▲  █  █          │      █  █     │      █  █     │      █  █     │      █  █
-        //          │
-        //          │search range of key-value pairs in cache layers that could
-        //          │affect whether to yield the next item in the underlying stream
-
-        // Optimization: ensure we have a peekable item in the underlying stream before continuing.
-        let mut this = self.project();
-        ready!(this.underlying.as_mut().poll_peek(cx));
-
-        // Now that we're ready to interleave the next underlying item with any
-        // cache layers, lock them all for the duration of the method, using a
-        // SmallVec to (hopefully) store all the guards on the stack.
-        let mut layer_guards = SmallVec::<[_; 8]>::new();
-        for layer in this.layers.iter() {
-            layer_guards.push(layer.read());
-        }
-        // Tacking the leaf cache onto the list is important to not miss any values.
-        // It's stored separately so that the contents of the
-        layer_guards.push(this.leaf_cache.read());
-
-        loop {
-            // Obtain a reference to the next key-value pair from the underlying stream.
-            let peeked = match ready!(this.underlying.as_mut().poll_peek(cx)) {
-                // If we get an underlying error, bubble it up immediately.
-                Some(Err(_e)) => return this.underlying.poll_next(cx),
-                // Otherwise, pass through the peeked value.
-                Some(Ok(pair)) => Some(pair),
-                None => None,
-            };
-
-            // To determine whether or not we should return the peeked value, we
-            // need to search the cache layers for keys that are between the last
-            // key we returned (exclusive, so we make forward progress on the
-            // stream) and the peeked key (inclusive, because we need to find out
-            // whether or not there was a covering deletion).
-            let search_range = (
-                this.last_key
-                    .as_ref()
-                    .map(Bound::Excluded)
-                    .unwrap_or(Bound::Included(this.prefix)),
-                peeked
-                    .map(|(k, _)| Bound::Included(k))
-                    .unwrap_or(Bound::Unbounded),
-            );
-
-            // It'd be slightly cleaner to initialize `leftmost_pair` with the
-            // peeked contents, but that would taint `leftmost_pair` with a
-            // `peeked` borrow, and we may need to mutate the underlying stream
-            // later.  Instead, initialize it with `None` to only search the
-            // cache layers, and compare at the end.
-            let mut leftmost_pair = None;
-            for layer in layer_guards.iter() {
-                // Find this layer's leftmost key-value pair in the search range.
-                let found_pair = layer
-                    .as_ref()
-                    .expect("layer must not have been applied")
-                    .nonverifiable_changes
-                    .range::<Vec<u8>, _>(search_range)
-                    .take_while(|(k, _v)| k.starts_with(this.prefix))
-                    .next();
-
-                // Check whether the new pair, if any, is the new leftmost pair.
-                match (leftmost_pair, found_pair) {
-                    // We want to replace the pair even when the key is equal,
-                    // so that we always prefer a newer value over an older value.
-                    (Some((leftmost_k, _)), Some((k, v))) if k <= leftmost_k => {
-                        leftmost_pair = Some((k, v));
-                    }
-                    (None, Some((k, v))) => {
-                        leftmost_pair = Some((k, v));
-                    }
-                    _ => {}
-                }
-            }
-
-            // Overwrite a Vec, attempting to reuse its existing allocation.
-            let overwrite_in_place = |dst: &mut Option<Vec<u8>>, src: &[u8]| {
-                if let Some(ref mut dst) = dst {
-                    dst.clear();
-                    dst.extend_from_slice(src);
-                } else {
-                    *dst = Some(src.to_vec());
-                }
-            };
-
-            match (leftmost_pair, peeked) {
-                (Some((k, v)), peeked) => {
-                    // Since we searched for cached keys less than or equal to
-                    // the peeked key, we know that the cached pair takes
-                    // priority over the peeked pair.
-                    //
-                    // If the keys are exactly equal, we advance the underlying stream.
-                    if peeked.map(|(kp, _)| kp) == Some(k) {
-                        let _ = this.underlying.as_mut().poll_next(cx);
-                    }
-                    overwrite_in_place(this.last_key, k);
-                    if let Some(v) = v {
-                        // If the value is Some, we have a key-value pair to yield.
-                        return Poll::Ready(Some(Ok((k.clone(), v.clone()))));
-                    } else {
-                        // If the value is None, this pair represents a deletion,
-                        // so continue looping until we find a non-deleted pair.
-                        continue;
-                    }
-                }
-                (None, Some(_)) => {
-                    // There's no cache hit before the peeked pair, so we want
-                    // to extract and return it from the underlying stream.
-                    let Poll::Ready(Some(Ok((k, v)))) = this.underlying.as_mut().poll_next(cx)
-                    else {
-                        unreachable!("peeked stream must yield peeked item");
-                    };
-                    overwrite_in_place(this.last_key, &k);
-                    return Poll::Ready(Some(Ok((k, v))));
-                }
-                (None, None) => {
-                    // Terminate the stream, no more items are available.
-                    return Poll::Ready(None);
-                }
-            }
-        }
-    }
-}
-
-// This implementation is almost exactly the same as the one above, but with
-// minor tweaks to work with string keys and to read different fields from the cache.
-// Update them together.
-
-#[pin_project]
-pub struct StateDeltaPrefixRawStream<St>
-where
-    St: Stream<Item = Result<(String, Vec<u8>)>>,
-{
-    #[pin]
-    pub(crate) underlying: Peekable<St>,
-    pub(crate) layers: Vec<Arc<RwLock<Option<Cache>>>>,
-    pub(crate) leaf_cache: Arc<RwLock<Option<Cache>>>,
-    pub(crate) last_key: Option<String>,
-    pub(crate) prefix: String,
-}
-
-impl<St> Stream for StateDeltaPrefixRawStream<St>
-where
-    St: Stream<Item = Result<(String, Vec<u8>)>>,
-{
-    type Item = Result<(String, Vec<u8>)>;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        // This implementation interleaves items from the underlying stream with
-        // items in cache layers.  To do this, it tracks the last key it
-        // returned, then, for each item in the underlying stream, searches for
-        // cached keys that lie between the last-returned key and the item's key,
-        // checking whether the cached key represents a deletion requiring further
-        // scanning.  This process is illustrated as follows:
-        //
-        //         ◇ skip                 ◇ skip           ▲ yield          ▲ yield           ▲ yield
-        //         │                      │                │                │                 │
-        //         ░ pick ──────────────▶ ░ pick ────────▶ █ pick ────────▶ █ pick ─────────▶ █ pick
-        //         ▲                      ▲                ▲                ▲                 ▲
-        //      ▲  │                 ▲    │          ▲     │         ▲      │        ▲        │
-        // write│  │                 │    │          │     │         │      │        │        │
-        // layer│  │   █             │    │ █        │     │█        │      █        │      █ │
-        //      │  │ ░               │    ░          │    ░│         │    ░          │    ░   │
-        //      │  ░                 │  ░            │  ░  │         │  ░            │  ░     │
-        //      │    █               │    █          │    █│         │    █          │    █   │
-        //      │  █     █           │  █     █      │  █  │  █      │  █     █      │  █     █
-        //      │     █              │     █         │     █         │     █         │     █
-        //     ─┼(─────]────keys─▶  ─┼──(───]────▶  ─┼────(─]────▶  ─┼─────(]────▶  ─┼──────(──]─▶
-        //      │   ▲  █  █          │      █  █     │      █  █     │      █  █     │      █  █
-        //          │
-        //          │search range of key-value pairs in cache layers that could
-        //          │affect whether to yield the next item in the underlying stream
-
-        // Optimization: ensure we have a peekable item in the underlying stream before continuing.
-        let mut this = self.project();
-        ready!(this.underlying.as_mut().poll_peek(cx));
-
-        // Now that we're ready to interleave the next underlying item with any
-        // cache layers, lock them all for the duration of the method, using a
-        // SmallVec to (hopefully) store all the guards on the stack.
-        let mut layer_guards = SmallVec::<[_; 8]>::new();
-        for layer in this.layers.iter() {
-            layer_guards.push(layer.read());
-        }
-        // Tacking the leaf cache onto the list is important to not miss any values.
-        // It's stored separately so that the contents of the
-        layer_guards.push(this.leaf_cache.read());
-
-        loop {
-            // Obtain a reference to the next key-value pair from the underlying stream.
-            let peeked = match ready!(this.underlying.as_mut().poll_peek(cx)) {
-                // If we get an underlying error, bubble it up immediately.
-                Some(Err(_e)) => return this.underlying.poll_next(cx),
-                // Otherwise, pass through the peeked value.
-                Some(Ok(pair)) => Some(pair),
-                None => None,
-            };
-
-            // To determine whether or not we should return the peeked value, we
-            // need to search the cache layers for keys that are between the last
-            // key we returned (exclusive, so we make forward progress on the
-            // stream) and the peeked key (inclusive, because we need to find out
-            // whether or not there was a covering deletion).
-            let search_range = (
-                this.last_key
-                    .as_ref()
-                    .map(Bound::Excluded)
-                    .unwrap_or(Bound::Included(this.prefix)),
-                peeked
-                    .map(|(k, _)| Bound::Included(k))
-                    .unwrap_or(Bound::Unbounded),
-            );
-
-            // It'd be slightly cleaner to initialize `leftmost_pair` with the
-            // peeked contents, but that would taint `leftmost_pair` with a
-            // `peeked` borrow, and we may need to mutate the underlying stream
-            // later.  Instead, initialize it with `None` to only search the
-            // cache layers, and compare at the end.
-            let mut leftmost_pair = None;
-            for layer in layer_guards.iter() {
-                // Find this layer's leftmost key-value pair in the search range.
-                let found_pair = layer
-                    .as_ref()
-                    .expect("layer must not have been applied")
-                    .unwritten_changes
-                    .range::<String, _>(search_range)
-                    .take_while(|(k, _v)| k.starts_with(this.prefix.as_str()))
-                    .next();
-
-                // Check whether the new pair, if any, is the new leftmost pair.
-                match (leftmost_pair, found_pair) {
-                    // We want to replace the pair even when the key is equal,
-                    // so that we always prefer a newer value over an older value.
-                    (Some((leftmost_k, _)), Some((k, v))) if k <= leftmost_k => {
-                        leftmost_pair = Some((k, v));
-                    }
-                    (None, Some((k, v))) => {
-                        leftmost_pair = Some((k, v));
-                    }
-                    _ => {}
-                }
-            }
-
-            // Overwrite a Vec, attempting to reuse its existing allocation.
-            let overwrite_in_place = |dst: &mut Option<String>, src: &str| {
-                if let Some(ref mut dst) = dst {
-                    dst.clear();
-                    dst.push_str(src);
-                } else {
-                    *dst = Some(src.to_owned());
-                }
-            };
-
-            match (leftmost_pair, peeked) {
-                (Some((k, v)), peeked) => {
-                    // Since we searched for cached keys less than or equal to
-                    // the peeked key, we know that the cached pair takes
-                    // priority over the peeked pair.
-                    //
-                    // If the keys are exactly equal, we advance the underlying stream.
-                    if peeked.map(|(kp, _)| kp) == Some(k) {
-                        let _ = this.underlying.as_mut().poll_next(cx);
-                    }
-                    overwrite_in_place(this.last_key, k);
-                    if let Some(v) = v {
-                        // If the value is Some, we have a key-value pair to yield.
-                        return Poll::Ready(Some(Ok((k.clone(), v.clone()))));
-                    } else {
-                        // If the value is None, this pair represents a deletion,
-                        // so continue looping until we find a non-deleted pair.
-                        continue;
-                    }
-                }
-                (None, Some(_)) => {
-                    // There's no cache hit before the peeked pair, so we want
-                    // to extract and return it from the underlying stream.
-                    let Poll::Ready(Some(Ok((k, v)))) = this.underlying.as_mut().poll_next(cx)
-                    else {
-                        unreachable!("peeked stream must yield peeked item");
-                    };
-                    overwrite_in_place(this.last_key, &k);
-                    return Poll::Ready(Some(Ok((k, v))));
-                }
-                (None, None) => {
-                    // Terminate the stream, no more items are available.
-                    return Poll::Ready(None);
-                }
-            }
-        }
-    }
-}
-
-// This implementation is almost exactly the same as the one above, but with
-// minor tweaks to work with string keys and to read different fields from the cache.
-// Update them together.
-
-#[pin_project]
-pub struct StateDeltaPrefixKeysStream<St>
-where
-    St: Stream<Item = Result<String>>,
-{
-    #[pin]
-    pub(crate) underlying: Peekable<St>,
-    pub(crate) layers: Vec<Arc<RwLock<Option<Cache>>>>,
-    pub(crate) leaf_cache: Arc<RwLock<Option<Cache>>>,
-    pub(crate) last_key: Option<String>,
-    pub(crate) prefix: String,
-}
-
-impl<St> Stream for StateDeltaPrefixKeysStream<St>
-where
-    St: Stream<Item = Result<String>>,
-{
-    type Item = Result<String>;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        // This implementation interleaves items from the underlying stream with
-        // items in cache layers.  To do this, it tracks the last key it
-        // returned, then, for each item in the underlying stream, searches for
-        // cached keys that lie between the last-returned key and the item's key,
-        // checking whether the cached key represents a deletion requiring further
-        // scanning.  This process is illustrated as follows:
-        //
-        //         ◇ skip                 ◇ skip           ▲ yield          ▲ yield           ▲ yield
-        //         │                      │                │                │                 │
-        //         ░ pick ──────────────▶ ░ pick ────────▶ █ pick ────────▶ █ pick ─────────▶ █ pick
-        //         ▲                      ▲                ▲                ▲                 ▲
-        //      ▲  │                 ▲    │          ▲     │         ▲      │        ▲        │
-        // write│  │                 │    │          │     │         │      │        │        │
-        // layer│  │   █             │    │ █        │     │█        │      █        │      █ │
-        //      │  │ ░               │    ░          │    ░│         │    ░          │    ░   │
-        //      │  ░                 │  ░            │  ░  │         │  ░            │  ░     │
-        //      │    █               │    █          │    █│         │    █          │    █   │
-        //      │  █     █           │  █     █      │  █  │  █      │  █     █      │  █     █
-        //      │     █              │     █         │     █         │     █         │     █
-        //     ─┼(─────]────keys─▶  ─┼──(───]────▶  ─┼────(─]────▶  ─┼─────(]────▶  ─┼──────(──]─▶
-        //      │   ▲  █  █          │      █  █     │      █  █     │      █  █     │      █  █
-        //          │
-        //          │search range of key-value pairs in cache layers that could
-        //          │affect whether to yield the next item in the underlying stream
-
-        // Optimization: ensure we have a peekable item in the underlying stream before continuing.
-        let mut this = self.project();
-        ready!(this.underlying.as_mut().poll_peek(cx));
-
-        // Now that we're ready to interleave the next underlying item with any
-        // cache layers, lock them all for the duration of the method, using a
-        // SmallVec to (hopefully) store all the guards on the stack.
-        let mut layer_guards = SmallVec::<[_; 8]>::new();
-        for layer in this.layers.iter() {
-            layer_guards.push(layer.read());
-        }
-        // Tacking the leaf cache onto the list is important to not miss any values.
-        // It's stored separately so that the contents of the
-        layer_guards.push(this.leaf_cache.read());
-
-        loop {
-            // Obtain a reference to the next key-value pair from the underlying stream.
-            let peeked = match ready!(this.underlying.as_mut().poll_peek(cx)) {
-                // If we get an underlying error, bubble it up immediately.
-                Some(Err(_e)) => return this.underlying.poll_next(cx),
-                // Otherwise, pass through the peeked value.
-                Some(Ok(pair)) => Some(pair),
-                None => None,
-            };
-
-            // To determine whether or not we should return the peeked value, we
-            // need to search the cache layers for keys that are between the last
-            // key we returned (exclusive, so we make forward progress on the
-            // stream) and the peeked key (inclusive, because we need to find out
-            // whether or not there was a covering deletion).
-            let search_range = (
-                this.last_key
-                    .as_ref()
-                    .map(Bound::Excluded)
-                    .unwrap_or(Bound::Included(this.prefix)),
-                peeked.map(Bound::Included).unwrap_or(Bound::Unbounded),
-            );
-
-            // It'd be slightly cleaner to initialize `leftmost_pair` with the
-            // peeked contents, but that would taint `leftmost_pair` with a
-            // `peeked` borrow, and we may need to mutate the underlying stream
-            // later.  Instead, initialize it with `None` to only search the
-            // cache layers, and compare at the end.
-            let mut leftmost_pair = None;
-            for layer in layer_guards.iter() {
-                // Find this layer's leftmost key-value pair in the search range.
-                let found_pair = layer
-                    .as_ref()
-                    .expect("layer must not have been applied")
-                    .unwritten_changes
-                    .range::<String, _>(search_range)
-                    .take_while(|(k, _v)| k.starts_with(this.prefix.as_str()))
-                    .next();
-
-                // Check whether the new pair, if any, is the new leftmost pair.
-                match (leftmost_pair, found_pair) {
-                    // We want to replace the pair even when the key is equal,
-                    // so that we always prefer a newer value over an older value.
-                    (Some((leftmost_k, _)), Some((k, v))) if k <= leftmost_k => {
-                        leftmost_pair = Some((k, v));
-                    }
-                    (None, Some((k, v))) => {
-                        leftmost_pair = Some((k, v));
-                    }
-                    _ => {}
-                }
-            }
-
-            // Overwrite a Vec, attempting to reuse its existing allocation.
-            let overwrite_in_place = |dst: &mut Option<String>, src: &str| {
-                if let Some(ref mut dst) = dst {
-                    dst.clear();
-                    dst.push_str(src);
-                } else {
-                    *dst = Some(src.to_owned());
-                }
-            };
-
-            match (leftmost_pair, peeked) {
-                (Some((k, v)), peeked) => {
-                    // Since we searched for cached keys less than or equal to
-                    // the peeked key, we know that the cached pair takes
-                    // priority over the peeked pair.
-                    //
-                    // If the keys are exactly equal, we advance the underlying stream.
-                    if peeked == Some(k) {
-                        let _ = this.underlying.as_mut().poll_next(cx);
-                    }
-                    overwrite_in_place(this.last_key, k);
-                    if v.is_some() {
-                        // If the value is Some, we have a key-value pair to yield.
-                        return Poll::Ready(Some(Ok(k.clone())));
-                    } else {
-                        // If the value is None, this pair represents a deletion,
-                        // so continue looping until we find a non-deleted pair.
-                        continue;
-                    }
-                }
-                (None, Some(_)) => {
-                    // There's no cache hit before the peeked pair, so we want
-                    // to extract and return it from the underlying stream.
-                    let Poll::Ready(Some(Ok(k))) = this.underlying.as_mut().poll_next(cx) else {
-                        unreachable!("peeked stream must yield peeked item");
-                    };
-                    overwrite_in_place(this.last_key, &k);
-                    return Poll::Ready(Some(Ok(k)));
-                }
-                (None, None) => {
-                    // Terminate the stream, no more items are available.
-                    return Poll::Ready(None);
-                }
-            }
-        }
-    }
-}
-
-#[pin_project]
-/// A stream of key-value pairs that interleaves a nonverifiable storage and caching layers.
-// This implementation differs from [`StateDeltaNonconsensusPrefixRawStream`] sin how
-// it specifies the search space for the cache.
-pub struct StateDeltaNonconsensusRangeRawStream<St>
-where
-    St: Stream<Item = Result<(Vec<u8>, Vec<u8>)>>,
-{
-    #[pin]
-    pub(crate) underlying: Peekable<St>,
-    pub(crate) layers: Vec<Arc<RwLock<Option<Cache>>>>,
-    pub(crate) leaf_cache: Arc<RwLock<Option<Cache>>>,
-    pub(crate) last_key: Option<Vec<u8>>,
-    pub(crate) prefix: Option<Vec<u8>>,
-    pub(crate) range: (Option<Vec<u8>>, Option<Vec<u8>>),
-}
-
-impl<St> Stream for StateDeltaNonconsensusRangeRawStream<St>
-where
-    St: Stream<Item = Result<(Vec<u8>, Vec<u8>)>>,
-{
-    type Item = Result<(Vec<u8>, Vec<u8>)>;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        // This implementation interleaves items from the underlying stream with
-        // items in cache layers.  To do this, it tracks the last key it
-        // returned, then, for each item in the underlying stream, searches for
-        // cached keys that lie between the last-returned key and the item's key,
-        // checking whether the cached key represents a deletion requiring further
-        // scanning.  This process is illustrated as follows:
-        //
-        //         ◇ skip                 ◇ skip           ▲ yield          ▲ yield           ▲ yield
-        //         │                      │                │                │                 │
-        //         ░ pick ──────────────▶ ░ pick ────────▶ █ pick ────────▶ █ pick ─────────▶ █ pick
-        //         ▲                      ▲                ▲                ▲                 ▲
-        //      ▲  │                 ▲    │          ▲     │         ▲      │        ▲        │
-        // write│  │                 │    │          │     │         │      │        │        │
-        // layer│  │   █             │    │ █        │     │█        │      █        │      █ │
-        //      │  │ ░               │    ░          │    ░│         │    ░          │    ░   │
-        //      │  ░                 │  ░            │  ░  │         │  ░            │  ░     │
-        //      │    █               │    █          │    █│         │    █          │    █   │
-        //      │  █     █           │  █     █      │  █  │  █      │  █     █      │  █     █
-        //      │     █              │     █         │     █         │     █         │     █
-        //     ─┼(─────]────keys─▶  ─┼──(───]────▶  ─┼────(─]────▶  ─┼─────(]────▶  ─┼──────(──]─▶
-        //      │   ▲  █  █          │      █  █     │      █  █     │      █  █     │      █  █
-        //          │
-        //          │search range of key-value pairs in cache layers that could
-        //          │affect whether to yield the next item in the underlying stream
-
-        // Optimization: ensure we have a peekable item in the underlying stream before continuing.
-        let mut this = self.project();
-        ready!(this.underlying.as_mut().poll_peek(cx));
-        // Now that we're ready to interleave the next underlying item with any
-        // cache layers, lock them all for the duration of the method, using a
-        // SmallVec to (hopefully) store all the guards on the stack.
-        let mut layer_guards = SmallVec::<[_; 8]>::new();
-        for layer in this.layers.iter() {
-            layer_guards.push(layer.read());
-        }
-        // Tacking the leaf cache onto the list is important to not miss any values.
-        // It's stored separately so that the contents of the
-        layer_guards.push(this.leaf_cache.read());
-
-        let (binding_prefix, binding_start, binding_end) = (Vec::new(), Vec::new(), Vec::new());
-        let prefix = this.prefix.as_ref().unwrap_or(&binding_prefix);
-        let start = this.range.0.as_ref().unwrap_or(&binding_start);
-        let end = this.range.1.as_ref().unwrap_or(&binding_end);
-
-        let mut prefix_start = Vec::with_capacity(prefix.len() + start.len());
-        let mut prefix_end = Vec::with_capacity(prefix.len() + end.len());
-
-        prefix_start.extend(prefix);
-        prefix_start.extend(start);
-        prefix_end.extend(prefix);
-        prefix_end.extend(end);
-
-        loop {
-            // Obtain a reference to the next key-value pair from the underlying stream.
-            let peeked = match ready!(this.underlying.as_mut().poll_peek(cx)) {
-                // If we get an underlying error, bubble it up immediately.
-                Some(Err(_e)) => return this.underlying.poll_next(cx),
-                // Otherwise, pass through the peeked value.
-                Some(Ok(pair)) => Some(pair),
-                None => None,
-            };
-
-            // We want to decide which key to return next, so we have to inspect the cache layers.
-            // To do this, we have to define a search space so that we cover updates and new insertions
-            // that could affect the next key to return.
-            let lower_bound = match this.last_key.as_ref() {
-                Some(k) => Bound::Excluded(k),
-                None => Bound::Included(prefix_start.as_ref()),
-            };
-
-            let upper_bound = match peeked {
-                Some((k, _v)) => Bound::Included(k),
-                None => this
-                    .range
-                    .1
-                    .as_ref()
-                    .map_or(Bound::Unbounded, |_| Bound::Excluded(prefix_end.as_ref())),
-            };
-
-            let search_range = (lower_bound, upper_bound);
-
-            tracing::debug!(
-                "searching cache layers for key-value pairs in range {:?}",
-                search_range
-            );
-
-            // It'd be slightly cleaner to initialize `leftmost_pair` with the
-            // peeked contents, but that would taint `leftmost_pair` with a
-            // `peeked` borrow, and we may need to mutate the underlying stream
-            // later.  Instead, initialize it with `None` to only search the
-            // cache layers, and compare at the end.
-            let mut leftmost_pair = None;
-            for layer in layer_guards.iter() {
-                // Find this layer's leftmost key-value pair in the search range.
-                let found_pair = layer
-                    .as_ref()
-                    .expect("layer must not have been applied")
-                    .nonverifiable_changes
-                    .range::<Vec<u8>, _>(search_range)
-                    .take_while(|(k, v)| {
-                        tracing::debug!(?v, ?k, "found key-value pair in cache layer");
-                        match peeked {
-                            Some((peeked_k, _)) => {
-                                k.starts_with(prefix.as_slice()) && k <= &peeked_k
-                            }
-                            None => k.starts_with(prefix.as_slice()),
-                        }
-                    })
-                    .next();
-
-                // Check whether the new pair, if any, is the new leftmost pair.
-                match (leftmost_pair, found_pair) {
-                    // We want to replace the pair even when the key is equal,
-                    // so that we always prefer a newer value over an older value.
-                    (Some((leftmost_k, _)), Some((k, v))) if k <= leftmost_k => {
-                        leftmost_pair = Some((k, v));
-                    }
-                    (None, Some((k, v))) => {
-                        leftmost_pair = Some((k, v));
-                    }
-                    _ => {}
-                }
-            }
-
-            // Overwrite a Vec, attempting to reuse its existing allocation.
-            let overwrite_in_place = |dst: &mut Option<Vec<u8>>, src: &[u8]| {
-                if let Some(ref mut dst) = dst {
-                    dst.clear();
-                    dst.extend_from_slice(src);
-                } else {
-                    *dst = Some(src.to_vec());
-                }
-            };
-
-            match (leftmost_pair, peeked) {
-                (Some((k, v)), peeked) => {
-                    // Since we searched for cached keys less than or equal to
-                    // the peeked key, we know that the cached pair takes
-                    // priority over the peeked pair.
-                    //
-                    // If the keys are exactly equal, we advance the underlying stream.
-                    if peeked.map(|(kp, _)| kp) == Some(k) {
-                        let _ = this.underlying.as_mut().poll_next(cx);
-                    }
-                    overwrite_in_place(this.last_key, k);
-                    if let Some(v) = v {
-                        // If the value is Some, we have a key-value pair to yield.
-                        return Poll::Ready(Some(Ok((k.clone(), v.clone()))));
-                    } else {
-                        // If the value is None, this pair represents a deletion,
-                        // so continue looping until we find a non-deleted pair.
-                        continue;
-                    }
-                }
-                (None, Some(_)) => {
-                    // There's no cache hit before the peeked pair, so we want
-                    // to extract and return it from the underlying stream.
-                    let Poll::Ready(Some(Ok((k, v)))) = this.underlying.as_mut().poll_next(cx)
-                    else {
-                        unreachable!("peeked stream must yield peeked item");
-                    };
-                    overwrite_in_place(this.last_key, &k);
-                    return Poll::Ready(Some(Ok((k, v))));
-                }
-                (None, None) => {
-                    // Terminate the stream, no more items are available.
-                    return Poll::Ready(None);
-                }
-            }
-        }
-    }
-}
diff --git a/crates/cnidarium/src/gen/penumbra.cnidarium.v1.rs b/crates/cnidarium/src/gen/penumbra.cnidarium.v1.rs
deleted file mode 100644
index 7a04181967..0000000000
--- a/crates/cnidarium/src/gen/penumbra.cnidarium.v1.rs
+++ /dev/null
@@ -1,815 +0,0 @@
-/// Performs a key-value query against the nonverifiable storage,
-/// using a byte-encoded key.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct NonVerifiableKeyValueRequest {
-    #[prost(message, optional, tag = "1")]
-    pub key: ::core::option::Option<non_verifiable_key_value_request::Key>,
-}
-/// Nested message and enum types in `NonVerifiableKeyValueRequest`.
-pub mod non_verifiable_key_value_request {
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct Key {
-        #[prost(bytes = "vec", tag = "1")]
-        pub inner: ::prost::alloc::vec::Vec<u8>,
-    }
-    impl ::prost::Name for Key {
-        const NAME: &'static str = "Key";
-        const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-        fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.cnidarium.v1.NonVerifiableKeyValueRequest.{}", Self::NAME
-            )
-        }
-    }
-}
-impl ::prost::Name for NonVerifiableKeyValueRequest {
-    const NAME: &'static str = "NonVerifiableKeyValueRequest";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct NonVerifiableKeyValueResponse {
-    /// The value corresponding to the specified key, if it was found.
-    #[prost(message, optional, tag = "1")]
-    pub value: ::core::option::Option<non_verifiable_key_value_response::Value>,
-}
-/// Nested message and enum types in `NonVerifiableKeyValueResponse`.
-pub mod non_verifiable_key_value_response {
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct Value {
-        #[prost(bytes = "vec", tag = "1")]
-        pub value: ::prost::alloc::vec::Vec<u8>,
-    }
-    impl ::prost::Name for Value {
-        const NAME: &'static str = "Value";
-        const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-        fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.cnidarium.v1.NonVerifiableKeyValueResponse.{}", Self::NAME
-            )
-        }
-    }
-}
-impl ::prost::Name for NonVerifiableKeyValueResponse {
-    const NAME: &'static str = "NonVerifiableKeyValueResponse";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// Performs a key-value query against the JMT, either by key or by key hash.
-///
-/// Proofs are only supported by key.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct KeyValueRequest {
-    /// If set, the key to fetch from storage.
-    #[prost(string, tag = "2")]
-    pub key: ::prost::alloc::string::String,
-    /// whether to return a proof
-    #[prost(bool, tag = "3")]
-    pub proof: bool,
-}
-impl ::prost::Name for KeyValueRequest {
-    const NAME: &'static str = "KeyValueRequest";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct KeyValueResponse {
-    /// The value corresponding to the specified key, if it was found.
-    #[prost(message, optional, tag = "1")]
-    pub value: ::core::option::Option<key_value_response::Value>,
-    /// A proof of existence or non-existence.
-    #[prost(message, optional, tag = "2")]
-    pub proof: ::core::option::Option<
-        ::ibc_proto::ibc::core::commitment::v1::MerkleProof,
-    >,
-}
-/// Nested message and enum types in `KeyValueResponse`.
-pub mod key_value_response {
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct Value {
-        #[prost(bytes = "vec", tag = "1")]
-        pub value: ::prost::alloc::vec::Vec<u8>,
-    }
-    impl ::prost::Name for Value {
-        const NAME: &'static str = "Value";
-        const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-        fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.cnidarium.v1.KeyValueResponse.{}", Self::NAME
-            )
-        }
-    }
-}
-impl ::prost::Name for KeyValueResponse {
-    const NAME: &'static str = "KeyValueResponse";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// Performs a prefixed key-value query, by string prefix.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PrefixValueRequest {
-    /// The prefix to fetch subkeys from storage.
-    #[prost(string, tag = "2")]
-    pub prefix: ::prost::alloc::string::String,
-}
-impl ::prost::Name for PrefixValueRequest {
-    const NAME: &'static str = "PrefixValueRequest";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PrefixValueResponse {
-    #[prost(string, tag = "1")]
-    pub key: ::prost::alloc::string::String,
-    #[prost(bytes = "vec", tag = "2")]
-    pub value: ::prost::alloc::vec::Vec<u8>,
-}
-impl ::prost::Name for PrefixValueResponse {
-    const NAME: &'static str = "PrefixValueResponse";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// Requests a stream of new key-value pairs that have been committed to the state.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct WatchRequest {
-    /// A regex for keys in the verifiable storage.
-    ///
-    /// Only key-value updates whose keys match this regex will be returned.
-    /// Note that the empty string matches all keys.
-    /// To exclude all keys, use the regex "$^", which matches no strings.
-    #[prost(string, tag = "1")]
-    pub key_regex: ::prost::alloc::string::String,
-    /// A regex for keys in the nonverifiable storage.
-    ///
-    /// Only key-value updates whose keys match this regex will be returned.
-    /// Note that the empty string matches all keys.
-    /// To exclude all keys, use the regex "$^", which matches no strings.
-    #[prost(string, tag = "2")]
-    pub nv_key_regex: ::prost::alloc::string::String,
-}
-impl ::prost::Name for WatchRequest {
-    const NAME: &'static str = "WatchRequest";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// A key-value pair that has been committed to the state.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct WatchResponse {
-    /// The state version the key-value pair was committed at.
-    #[prost(uint64, tag = "1")]
-    pub version: u64,
-    /// The entry that was committed.
-    #[prost(oneof = "watch_response::Entry", tags = "5, 6")]
-    pub entry: ::core::option::Option<watch_response::Entry>,
-}
-/// Nested message and enum types in `WatchResponse`.
-pub mod watch_response {
-    /// Elements of the verifiable storage have string keys.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct KeyValue {
-        #[prost(string, tag = "1")]
-        pub key: ::prost::alloc::string::String,
-        #[prost(bytes = "vec", tag = "2")]
-        pub value: ::prost::alloc::vec::Vec<u8>,
-        /// If set to true, the key-value pair was deleted.
-        /// This allows distinguishing a deleted key-value pair from a key-value pair whose value is empty.
-        #[prost(bool, tag = "3")]
-        pub deleted: bool,
-    }
-    impl ::prost::Name for KeyValue {
-        const NAME: &'static str = "KeyValue";
-        const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-        fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!("penumbra.cnidarium.v1.WatchResponse.{}", Self::NAME)
-        }
-    }
-    /// Elements of the nonverifiable storage have byte keys.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct NvKeyValue {
-        #[prost(bytes = "vec", tag = "1")]
-        pub key: ::prost::alloc::vec::Vec<u8>,
-        #[prost(bytes = "vec", tag = "2")]
-        pub value: ::prost::alloc::vec::Vec<u8>,
-        /// If set to true, the key-value pair was deleted.
-        /// This allows distinguishing a deleted key-value pair from a key-value pair whose value is empty.
-        #[prost(bool, tag = "3")]
-        pub deleted: bool,
-    }
-    impl ::prost::Name for NvKeyValue {
-        const NAME: &'static str = "NvKeyValue";
-        const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-        fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!("penumbra.cnidarium.v1.WatchResponse.{}", Self::NAME)
-        }
-    }
-    /// The entry that was committed.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Entry {
-        #[prost(message, tag = "5")]
-        Kv(KeyValue),
-        #[prost(message, tag = "6")]
-        NvKv(NvKeyValue),
-    }
-}
-impl ::prost::Name for WatchResponse {
-    const NAME: &'static str = "WatchResponse";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// Generated client implementations.
-#[cfg(feature = "rpc")]
-pub mod query_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct QueryServiceClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl QueryServiceClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> QueryServiceClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> QueryServiceClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
-        {
-            QueryServiceClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        /// General-purpose key-value state query API, that can be used to query
-        /// arbitrary keys in the JMT storage.
-        pub async fn key_value(
-            &mut self,
-            request: impl tonic::IntoRequest<super::KeyValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::KeyValueResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/penumbra.cnidarium.v1.QueryService/KeyValue",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(
-                    GrpcMethod::new("penumbra.cnidarium.v1.QueryService", "KeyValue"),
-                );
-            self.inner.unary(req, path, codec).await
-        }
-        /// General-purpose key-value state query API, that can be used to query
-        /// arbitrary keys in the non-verifiable storage.
-        pub async fn non_verifiable_key_value(
-            &mut self,
-            request: impl tonic::IntoRequest<super::NonVerifiableKeyValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::NonVerifiableKeyValueResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/penumbra.cnidarium.v1.QueryService/NonVerifiableKeyValue",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(
-                    GrpcMethod::new(
-                        "penumbra.cnidarium.v1.QueryService",
-                        "NonVerifiableKeyValue",
-                    ),
-                );
-            self.inner.unary(req, path, codec).await
-        }
-        /// General-purpose prefixed key-value state query API, that can be used to query
-        /// arbitrary prefixes in the JMT storage.
-        pub async fn prefix_value(
-            &mut self,
-            request: impl tonic::IntoRequest<super::PrefixValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<tonic::codec::Streaming<super::PrefixValueResponse>>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/penumbra.cnidarium.v1.QueryService/PrefixValue",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(
-                    GrpcMethod::new("penumbra.cnidarium.v1.QueryService", "PrefixValue"),
-                );
-            self.inner.server_streaming(req, path, codec).await
-        }
-        /// Subscribes to a stream of key-value updates, with regex filtering on keys.
-        pub async fn watch(
-            &mut self,
-            request: impl tonic::IntoRequest<super::WatchRequest>,
-        ) -> std::result::Result<
-            tonic::Response<tonic::codec::Streaming<super::WatchResponse>>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/penumbra.cnidarium.v1.QueryService/Watch",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("penumbra.cnidarium.v1.QueryService", "Watch"));
-            self.inner.server_streaming(req, path, codec).await
-        }
-    }
-}
-/// Generated server implementations.
-#[cfg(feature = "rpc")]
-pub mod query_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    /// Generated trait containing gRPC methods that should be implemented for use with QueryServiceServer.
-    #[async_trait]
-    pub trait QueryService: Send + Sync + 'static {
-        /// General-purpose key-value state query API, that can be used to query
-        /// arbitrary keys in the JMT storage.
-        async fn key_value(
-            &self,
-            request: tonic::Request<super::KeyValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::KeyValueResponse>,
-            tonic::Status,
-        >;
-        /// General-purpose key-value state query API, that can be used to query
-        /// arbitrary keys in the non-verifiable storage.
-        async fn non_verifiable_key_value(
-            &self,
-            request: tonic::Request<super::NonVerifiableKeyValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::NonVerifiableKeyValueResponse>,
-            tonic::Status,
-        >;
-        /// Server streaming response type for the PrefixValue method.
-        type PrefixValueStream: tonic::codegen::tokio_stream::Stream<
-                Item = std::result::Result<super::PrefixValueResponse, tonic::Status>,
-            >
-            + Send
-            + 'static;
-        /// General-purpose prefixed key-value state query API, that can be used to query
-        /// arbitrary prefixes in the JMT storage.
-        async fn prefix_value(
-            &self,
-            request: tonic::Request<super::PrefixValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<Self::PrefixValueStream>,
-            tonic::Status,
-        >;
-        /// Server streaming response type for the Watch method.
-        type WatchStream: tonic::codegen::tokio_stream::Stream<
-                Item = std::result::Result<super::WatchResponse, tonic::Status>,
-            >
-            + Send
-            + 'static;
-        /// Subscribes to a stream of key-value updates, with regex filtering on keys.
-        async fn watch(
-            &self,
-            request: tonic::Request<super::WatchRequest>,
-        ) -> std::result::Result<tonic::Response<Self::WatchStream>, tonic::Status>;
-    }
-    #[derive(Debug)]
-    pub struct QueryServiceServer<T: QueryService> {
-        inner: _Inner<T>,
-        accept_compression_encodings: EnabledCompressionEncodings,
-        send_compression_encodings: EnabledCompressionEncodings,
-        max_decoding_message_size: Option<usize>,
-        max_encoding_message_size: Option<usize>,
-    }
-    struct _Inner<T>(Arc<T>);
-    impl<T: QueryService> QueryServiceServer<T> {
-        pub fn new(inner: T) -> Self {
-            Self::from_arc(Arc::new(inner))
-        }
-        pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
-            Self {
-                inner,
-                accept_compression_encodings: Default::default(),
-                send_compression_encodings: Default::default(),
-                max_decoding_message_size: None,
-                max_encoding_message_size: None,
-            }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> InterceptedService<Self, F>
-        where
-            F: tonic::service::Interceptor,
-        {
-            InterceptedService::new(Self::new(inner), interceptor)
-        }
-        /// Enable decompressing requests with the given encoding.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.accept_compression_encodings.enable(encoding);
-            self
-        }
-        /// Compress responses with the given encoding, if the client supports it.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.send_compression_encodings.enable(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.max_decoding_message_size = Some(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.max_encoding_message_size = Some(limit);
-            self
-        }
-    }
-    impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServiceServer<T>
-    where
-        T: QueryService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
-    {
-        type Response = http::Response<tonic::body::BoxBody>;
-        type Error = std::convert::Infallible;
-        type Future = BoxFuture<Self::Response, Self::Error>;
-        fn poll_ready(
-            &mut self,
-            _cx: &mut Context<'_>,
-        ) -> Poll<std::result::Result<(), Self::Error>> {
-            Poll::Ready(Ok(()))
-        }
-        fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
-            match req.uri().path() {
-                "/penumbra.cnidarium.v1.QueryService/KeyValue" => {
-                    #[allow(non_camel_case_types)]
-                    struct KeyValueSvc<T: QueryService>(pub Arc<T>);
-                    impl<
-                        T: QueryService,
-                    > tonic::server::UnaryService<super::KeyValueRequest>
-                    for KeyValueSvc<T> {
-                        type Response = super::KeyValueResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::KeyValueRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                <T as QueryService>::key_value(&inner, request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = KeyValueSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/penumbra.cnidarium.v1.QueryService/NonVerifiableKeyValue" => {
-                    #[allow(non_camel_case_types)]
-                    struct NonVerifiableKeyValueSvc<T: QueryService>(pub Arc<T>);
-                    impl<
-                        T: QueryService,
-                    > tonic::server::UnaryService<super::NonVerifiableKeyValueRequest>
-                    for NonVerifiableKeyValueSvc<T> {
-                        type Response = super::NonVerifiableKeyValueResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::NonVerifiableKeyValueRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                <T as QueryService>::non_verifiable_key_value(
-                                        &inner,
-                                        request,
-                                    )
-                                    .await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = NonVerifiableKeyValueSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/penumbra.cnidarium.v1.QueryService/PrefixValue" => {
-                    #[allow(non_camel_case_types)]
-                    struct PrefixValueSvc<T: QueryService>(pub Arc<T>);
-                    impl<
-                        T: QueryService,
-                    > tonic::server::ServerStreamingService<super::PrefixValueRequest>
-                    for PrefixValueSvc<T> {
-                        type Response = super::PrefixValueResponse;
-                        type ResponseStream = T::PrefixValueStream;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::ResponseStream>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::PrefixValueRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                <T as QueryService>::prefix_value(&inner, request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = PrefixValueSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.server_streaming(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/penumbra.cnidarium.v1.QueryService/Watch" => {
-                    #[allow(non_camel_case_types)]
-                    struct WatchSvc<T: QueryService>(pub Arc<T>);
-                    impl<
-                        T: QueryService,
-                    > tonic::server::ServerStreamingService<super::WatchRequest>
-                    for WatchSvc<T> {
-                        type Response = super::WatchResponse;
-                        type ResponseStream = T::WatchStream;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::ResponseStream>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::WatchRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                <T as QueryService>::watch(&inner, request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = WatchSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.server_streaming(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                _ => {
-                    Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
-                    })
-                }
-            }
-        }
-    }
-    impl<T: QueryService> Clone for QueryServiceServer<T> {
-        fn clone(&self) -> Self {
-            let inner = self.inner.clone();
-            Self {
-                inner,
-                accept_compression_encodings: self.accept_compression_encodings,
-                send_compression_encodings: self.send_compression_encodings,
-                max_decoding_message_size: self.max_decoding_message_size,
-                max_encoding_message_size: self.max_encoding_message_size,
-            }
-        }
-    }
-    impl<T: QueryService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: QueryService> tonic::server::NamedService for QueryServiceServer<T> {
-        const NAME: &'static str = "penumbra.cnidarium.v1.QueryService";
-    }
-}
diff --git a/crates/cnidarium/src/gen/penumbra.cnidarium.v1.serde.rs b/crates/cnidarium/src/gen/penumbra.cnidarium.v1.serde.rs
deleted file mode 100644
index 8751e80e6e..0000000000
--- a/crates/cnidarium/src/gen/penumbra.cnidarium.v1.serde.rs
+++ /dev/null
@@ -1,1433 +0,0 @@
-impl serde::Serialize for KeyValueRequest {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key.is_empty() {
-            len += 1;
-        }
-        if self.proof {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.KeyValueRequest", len)?;
-        if !self.key.is_empty() {
-            struct_ser.serialize_field("key", &self.key)?;
-        }
-        if self.proof {
-            struct_ser.serialize_field("proof", &self.proof)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for KeyValueRequest {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-            "proof",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            Proof,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            "proof" => Ok(GeneratedField::Proof),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = KeyValueRequest;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.KeyValueRequest")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<KeyValueRequest, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                let mut proof__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::Proof => {
-                            if proof__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("proof"));
-                            }
-                            proof__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(KeyValueRequest {
-                    key: key__.unwrap_or_default(),
-                    proof: proof__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.KeyValueRequest", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for KeyValueResponse {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if self.value.is_some() {
-            len += 1;
-        }
-        if self.proof.is_some() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.KeyValueResponse", len)?;
-        if let Some(v) = self.value.as_ref() {
-            struct_ser.serialize_field("value", v)?;
-        }
-        if let Some(v) = self.proof.as_ref() {
-            struct_ser.serialize_field("proof", v)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for KeyValueResponse {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "value",
-            "proof",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Value,
-            Proof,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "value" => Ok(GeneratedField::Value),
-                            "proof" => Ok(GeneratedField::Proof),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = KeyValueResponse;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.KeyValueResponse")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<KeyValueResponse, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut value__ = None;
-                let mut proof__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = map_.next_value()?;
-                        }
-                        GeneratedField::Proof => {
-                            if proof__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("proof"));
-                            }
-                            proof__ = map_.next_value()?;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(KeyValueResponse {
-                    value: value__,
-                    proof: proof__,
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.KeyValueResponse", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for key_value_response::Value {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.KeyValueResponse.Value", len)?;
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for key_value_response::Value {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "value",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Value,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "value" => Ok(GeneratedField::Value),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = key_value_response::Value;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.KeyValueResponse.Value")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<key_value_response::Value, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut value__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(key_value_response::Value {
-                    value: value__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.KeyValueResponse.Value", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for NonVerifiableKeyValueRequest {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if self.key.is_some() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueRequest", len)?;
-        if let Some(v) = self.key.as_ref() {
-            struct_ser.serialize_field("key", v)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for NonVerifiableKeyValueRequest {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = NonVerifiableKeyValueRequest;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.NonVerifiableKeyValueRequest")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<NonVerifiableKeyValueRequest, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = map_.next_value()?;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(NonVerifiableKeyValueRequest {
-                    key: key__,
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueRequest", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for non_verifiable_key_value_request::Key {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.inner.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueRequest.Key", len)?;
-        if !self.inner.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for non_verifiable_key_value_request::Key {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "inner",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Inner,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "inner" => Ok(GeneratedField::Inner),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = non_verifiable_key_value_request::Key;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.NonVerifiableKeyValueRequest.Key")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<non_verifiable_key_value_request::Key, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut inner__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Inner => {
-                            if inner__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("inner"));
-                            }
-                            inner__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(non_verifiable_key_value_request::Key {
-                    inner: inner__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueRequest.Key", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for NonVerifiableKeyValueResponse {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if self.value.is_some() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueResponse", len)?;
-        if let Some(v) = self.value.as_ref() {
-            struct_ser.serialize_field("value", v)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for NonVerifiableKeyValueResponse {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "value",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Value,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "value" => Ok(GeneratedField::Value),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = NonVerifiableKeyValueResponse;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.NonVerifiableKeyValueResponse")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<NonVerifiableKeyValueResponse, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut value__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = map_.next_value()?;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(NonVerifiableKeyValueResponse {
-                    value: value__,
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueResponse", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for non_verifiable_key_value_response::Value {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueResponse.Value", len)?;
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for non_verifiable_key_value_response::Value {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "value",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Value,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "value" => Ok(GeneratedField::Value),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = non_verifiable_key_value_response::Value;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.NonVerifiableKeyValueResponse.Value")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<non_verifiable_key_value_response::Value, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut value__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(non_verifiable_key_value_response::Value {
-                    value: value__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueResponse.Value", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for PrefixValueRequest {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.prefix.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.PrefixValueRequest", len)?;
-        if !self.prefix.is_empty() {
-            struct_ser.serialize_field("prefix", &self.prefix)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for PrefixValueRequest {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "prefix",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Prefix,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "prefix" => Ok(GeneratedField::Prefix),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = PrefixValueRequest;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.PrefixValueRequest")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<PrefixValueRequest, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut prefix__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Prefix => {
-                            if prefix__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("prefix"));
-                            }
-                            prefix__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(PrefixValueRequest {
-                    prefix: prefix__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.PrefixValueRequest", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for PrefixValueResponse {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key.is_empty() {
-            len += 1;
-        }
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.PrefixValueResponse", len)?;
-        if !self.key.is_empty() {
-            struct_ser.serialize_field("key", &self.key)?;
-        }
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for PrefixValueResponse {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-            "value",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            Value,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            "value" => Ok(GeneratedField::Value),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = PrefixValueResponse;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.PrefixValueResponse")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<PrefixValueResponse, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                let mut value__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(PrefixValueResponse {
-                    key: key__.unwrap_or_default(),
-                    value: value__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.PrefixValueResponse", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for WatchRequest {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key_regex.is_empty() {
-            len += 1;
-        }
-        if !self.nv_key_regex.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.WatchRequest", len)?;
-        if !self.key_regex.is_empty() {
-            struct_ser.serialize_field("keyRegex", &self.key_regex)?;
-        }
-        if !self.nv_key_regex.is_empty() {
-            struct_ser.serialize_field("nvKeyRegex", &self.nv_key_regex)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for WatchRequest {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key_regex",
-            "keyRegex",
-            "nv_key_regex",
-            "nvKeyRegex",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            KeyRegex,
-            NvKeyRegex,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "keyRegex" | "key_regex" => Ok(GeneratedField::KeyRegex),
-                            "nvKeyRegex" | "nv_key_regex" => Ok(GeneratedField::NvKeyRegex),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = WatchRequest;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.WatchRequest")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<WatchRequest, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key_regex__ = None;
-                let mut nv_key_regex__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::KeyRegex => {
-                            if key_regex__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("keyRegex"));
-                            }
-                            key_regex__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::NvKeyRegex => {
-                            if nv_key_regex__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("nvKeyRegex"));
-                            }
-                            nv_key_regex__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(WatchRequest {
-                    key_regex: key_regex__.unwrap_or_default(),
-                    nv_key_regex: nv_key_regex__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.WatchRequest", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for WatchResponse {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if self.version != 0 {
-            len += 1;
-        }
-        if self.entry.is_some() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.WatchResponse", len)?;
-        if self.version != 0 {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("version", ToString::to_string(&self.version).as_str())?;
-        }
-        if let Some(v) = self.entry.as_ref() {
-            match v {
-                watch_response::Entry::Kv(v) => {
-                    struct_ser.serialize_field("kv", v)?;
-                }
-                watch_response::Entry::NvKv(v) => {
-                    struct_ser.serialize_field("nvKv", v)?;
-                }
-            }
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for WatchResponse {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "version",
-            "kv",
-            "nv_kv",
-            "nvKv",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Version,
-            Kv,
-            NvKv,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "version" => Ok(GeneratedField::Version),
-                            "kv" => Ok(GeneratedField::Kv),
-                            "nvKv" | "nv_kv" => Ok(GeneratedField::NvKv),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = WatchResponse;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.WatchResponse")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<WatchResponse, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut version__ = None;
-                let mut entry__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Version => {
-                            if version__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("version"));
-                            }
-                            version__ = 
-                                Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::Kv => {
-                            if entry__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("kv"));
-                            }
-                            entry__ = map_.next_value::<::std::option::Option<_>>()?.map(watch_response::Entry::Kv)
-;
-                        }
-                        GeneratedField::NvKv => {
-                            if entry__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("nvKv"));
-                            }
-                            entry__ = map_.next_value::<::std::option::Option<_>>()?.map(watch_response::Entry::NvKv)
-;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(WatchResponse {
-                    version: version__.unwrap_or_default(),
-                    entry: entry__,
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.WatchResponse", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for watch_response::KeyValue {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key.is_empty() {
-            len += 1;
-        }
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        if self.deleted {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.WatchResponse.KeyValue", len)?;
-        if !self.key.is_empty() {
-            struct_ser.serialize_field("key", &self.key)?;
-        }
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        if self.deleted {
-            struct_ser.serialize_field("deleted", &self.deleted)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for watch_response::KeyValue {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-            "value",
-            "deleted",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            Value,
-            Deleted,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            "value" => Ok(GeneratedField::Value),
-                            "deleted" => Ok(GeneratedField::Deleted),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = watch_response::KeyValue;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.WatchResponse.KeyValue")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<watch_response::KeyValue, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                let mut value__ = None;
-                let mut deleted__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::Deleted => {
-                            if deleted__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("deleted"));
-                            }
-                            deleted__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(watch_response::KeyValue {
-                    key: key__.unwrap_or_default(),
-                    value: value__.unwrap_or_default(),
-                    deleted: deleted__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.WatchResponse.KeyValue", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for watch_response::NvKeyValue {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key.is_empty() {
-            len += 1;
-        }
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        if self.deleted {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.WatchResponse.NvKeyValue", len)?;
-        if !self.key.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("key", pbjson::private::base64::encode(&self.key).as_str())?;
-        }
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        if self.deleted {
-            struct_ser.serialize_field("deleted", &self.deleted)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for watch_response::NvKeyValue {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-            "value",
-            "deleted",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            Value,
-            Deleted,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            "value" => Ok(GeneratedField::Value),
-                            "deleted" => Ok(GeneratedField::Deleted),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = watch_response::NvKeyValue;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.WatchResponse.NvKeyValue")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<watch_response::NvKeyValue, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                let mut value__ = None;
-                let mut deleted__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::Deleted => {
-                            if deleted__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("deleted"));
-                            }
-                            deleted__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(watch_response::NvKeyValue {
-                    key: key__.unwrap_or_default(),
-                    value: value__.unwrap_or_default(),
-                    deleted: deleted__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.WatchResponse.NvKeyValue", FIELDS, GeneratedVisitor)
-    }
-}
diff --git a/crates/cnidarium/src/gen/penumbra.cnidarium.v1alpha1.rs b/crates/cnidarium/src/gen/penumbra.cnidarium.v1alpha1.rs
deleted file mode 100644
index 7c9f774f27..0000000000
--- a/crates/cnidarium/src/gen/penumbra.cnidarium.v1alpha1.rs
+++ /dev/null
@@ -1,671 +0,0 @@
-/// Performs a key-value query, either by key or by key hash.
-///
-/// Proofs are only supported by key.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct KeyValueRequest {
-    /// If set, the key to fetch from storage.
-    #[prost(string, tag = "2")]
-    pub key: ::prost::alloc::string::String,
-    /// whether to return a proof
-    #[prost(bool, tag = "3")]
-    pub proof: bool,
-}
-impl ::prost::Name for KeyValueRequest {
-    const NAME: &'static str = "KeyValueRequest";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct KeyValueResponse {
-    /// The value corresponding to the specified key, if it was found.
-    #[prost(message, optional, tag = "1")]
-    pub value: ::core::option::Option<key_value_response::Value>,
-    /// A proof of existence or non-existence.
-    #[prost(message, optional, tag = "2")]
-    pub proof: ::core::option::Option<
-        ::ibc_proto::ibc::core::commitment::v1::MerkleProof,
-    >,
-}
-/// Nested message and enum types in `KeyValueResponse`.
-pub mod key_value_response {
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct Value {
-        #[prost(bytes = "vec", tag = "1")]
-        pub value: ::prost::alloc::vec::Vec<u8>,
-    }
-    impl ::prost::Name for Value {
-        const NAME: &'static str = "Value";
-        const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-        fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.cnidarium.v1.KeyValueResponse.{}", Self::NAME
-            )
-        }
-    }
-}
-impl ::prost::Name for KeyValueResponse {
-    const NAME: &'static str = "KeyValueResponse";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// Performs a prefixed key-value query, by string prefix.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PrefixValueRequest {
-    /// The prefix to fetch subkeys from storage.
-    #[prost(string, tag = "2")]
-    pub prefix: ::prost::alloc::string::String,
-}
-impl ::prost::Name for PrefixValueRequest {
-    const NAME: &'static str = "PrefixValueRequest";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PrefixValueResponse {
-    #[prost(string, tag = "1")]
-    pub key: ::prost::alloc::string::String,
-    #[prost(bytes = "vec", tag = "2")]
-    pub value: ::prost::alloc::vec::Vec<u8>,
-}
-impl ::prost::Name for PrefixValueResponse {
-    const NAME: &'static str = "PrefixValueResponse";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// Requests a stream of new key-value pairs that have been committed to the state.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct WatchRequest {
-    /// A regex for keys in the verifiable storage.
-    ///
-    /// Only key-value updates whose keys match this regex will be returned.
-    /// Note that the empty string matches all keys.
-    /// To exclude all keys, use the regex "$^", which matches no strings.
-    #[prost(string, tag = "1")]
-    pub key_regex: ::prost::alloc::string::String,
-    /// A regex for keys in the nonverifiable storage.
-    ///
-    /// Only key-value updates whose keys match this regex will be returned.
-    /// Note that the empty string matches all keys.
-    /// To exclude all keys, use the regex "$^", which matches no strings.
-    #[prost(string, tag = "2")]
-    pub nv_key_regex: ::prost::alloc::string::String,
-}
-impl ::prost::Name for WatchRequest {
-    const NAME: &'static str = "WatchRequest";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// A key-value pair that has been committed to the state.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct WatchResponse {
-    /// The state version the key-value pair was committed at.
-    #[prost(uint64, tag = "1")]
-    pub version: u64,
-    /// The entry that was committed.
-    #[prost(oneof = "watch_response::Entry", tags = "5, 6")]
-    pub entry: ::core::option::Option<watch_response::Entry>,
-}
-/// Nested message and enum types in `WatchResponse`.
-pub mod watch_response {
-    /// Elements of the verifiable storage have string keys.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct KeyValue {
-        #[prost(string, tag = "1")]
-        pub key: ::prost::alloc::string::String,
-        #[prost(bytes = "vec", tag = "2")]
-        pub value: ::prost::alloc::vec::Vec<u8>,
-        /// If set to true, the key-value pair was deleted.
-        /// This allows distinguishing a deleted key-value pair from a key-value pair whose value is empty.
-        #[prost(bool, tag = "3")]
-        pub deleted: bool,
-    }
-    impl ::prost::Name for KeyValue {
-        const NAME: &'static str = "KeyValue";
-        const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-        fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.cnidarium.v1.WatchResponse.{}", Self::NAME
-            )
-        }
-    }
-    /// Elements of the nonverifiable storage have byte keys.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct NvKeyValue {
-        #[prost(bytes = "vec", tag = "1")]
-        pub key: ::prost::alloc::vec::Vec<u8>,
-        #[prost(bytes = "vec", tag = "2")]
-        pub value: ::prost::alloc::vec::Vec<u8>,
-        /// If set to true, the key-value pair was deleted.
-        /// This allows distinguishing a deleted key-value pair from a key-value pair whose value is empty.
-        #[prost(bool, tag = "3")]
-        pub deleted: bool,
-    }
-    impl ::prost::Name for NvKeyValue {
-        const NAME: &'static str = "NvKeyValue";
-        const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-        fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.cnidarium.v1.WatchResponse.{}", Self::NAME
-            )
-        }
-    }
-    /// The entry that was committed.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Entry {
-        #[prost(message, tag = "5")]
-        Kv(KeyValue),
-        #[prost(message, tag = "6")]
-        NvKv(NvKeyValue),
-    }
-}
-impl ::prost::Name for WatchResponse {
-    const NAME: &'static str = "WatchResponse";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// Generated client implementations.
-#[cfg(feature = "rpc")]
-pub mod query_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct QueryServiceClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl QueryServiceClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> QueryServiceClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> QueryServiceClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
-        {
-            QueryServiceClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        /// General-purpose key-value state query API, that can be used to query
-        /// arbitrary keys in the JMT storage.
-        pub async fn key_value(
-            &mut self,
-            request: impl tonic::IntoRequest<super::KeyValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::KeyValueResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/penumbra.cnidarium.v1.QueryService/KeyValue",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(
-                    GrpcMethod::new(
-                        "penumbra.cnidarium.v1.QueryService",
-                        "KeyValue",
-                    ),
-                );
-            self.inner.unary(req, path, codec).await
-        }
-        /// General-purpose prefixed key-value state query API, that can be used to query
-        /// arbitrary prefixes in the JMT storage.
-        pub async fn prefix_value(
-            &mut self,
-            request: impl tonic::IntoRequest<super::PrefixValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<tonic::codec::Streaming<super::PrefixValueResponse>>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/penumbra.cnidarium.v1.QueryService/PrefixValue",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(
-                    GrpcMethod::new(
-                        "penumbra.cnidarium.v1.QueryService",
-                        "PrefixValue",
-                    ),
-                );
-            self.inner.server_streaming(req, path, codec).await
-        }
-        /// Subscribes to a stream of key-value updates, with regex filtering on keys.
-        pub async fn watch(
-            &mut self,
-            request: impl tonic::IntoRequest<super::WatchRequest>,
-        ) -> std::result::Result<
-            tonic::Response<tonic::codec::Streaming<super::WatchResponse>>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/penumbra.cnidarium.v1.QueryService/Watch",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(
-                    GrpcMethod::new("penumbra.cnidarium.v1.QueryService", "Watch"),
-                );
-            self.inner.server_streaming(req, path, codec).await
-        }
-    }
-}
-/// Generated server implementations.
-#[cfg(feature = "rpc")]
-pub mod query_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    /// Generated trait containing gRPC methods that should be implemented for use with QueryServiceServer.
-    #[async_trait]
-    pub trait QueryService: Send + Sync + 'static {
-        /// General-purpose key-value state query API, that can be used to query
-        /// arbitrary keys in the JMT storage.
-        async fn key_value(
-            &self,
-            request: tonic::Request<super::KeyValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::KeyValueResponse>,
-            tonic::Status,
-        >;
-        /// Server streaming response type for the PrefixValue method.
-        type PrefixValueStream: tonic::codegen::tokio_stream::Stream<
-                Item = std::result::Result<super::PrefixValueResponse, tonic::Status>,
-            >
-            + Send
-            + 'static;
-        /// General-purpose prefixed key-value state query API, that can be used to query
-        /// arbitrary prefixes in the JMT storage.
-        async fn prefix_value(
-            &self,
-            request: tonic::Request<super::PrefixValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<Self::PrefixValueStream>,
-            tonic::Status,
-        >;
-        /// Server streaming response type for the Watch method.
-        type WatchStream: tonic::codegen::tokio_stream::Stream<
-                Item = std::result::Result<super::WatchResponse, tonic::Status>,
-            >
-            + Send
-            + 'static;
-        /// Subscribes to a stream of key-value updates, with regex filtering on keys.
-        async fn watch(
-            &self,
-            request: tonic::Request<super::WatchRequest>,
-        ) -> std::result::Result<tonic::Response<Self::WatchStream>, tonic::Status>;
-    }
-    #[derive(Debug)]
-    pub struct QueryServiceServer<T: QueryService> {
-        inner: _Inner<T>,
-        accept_compression_encodings: EnabledCompressionEncodings,
-        send_compression_encodings: EnabledCompressionEncodings,
-        max_decoding_message_size: Option<usize>,
-        max_encoding_message_size: Option<usize>,
-    }
-    struct _Inner<T>(Arc<T>);
-    impl<T: QueryService> QueryServiceServer<T> {
-        pub fn new(inner: T) -> Self {
-            Self::from_arc(Arc::new(inner))
-        }
-        pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
-            Self {
-                inner,
-                accept_compression_encodings: Default::default(),
-                send_compression_encodings: Default::default(),
-                max_decoding_message_size: None,
-                max_encoding_message_size: None,
-            }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> InterceptedService<Self, F>
-        where
-            F: tonic::service::Interceptor,
-        {
-            InterceptedService::new(Self::new(inner), interceptor)
-        }
-        /// Enable decompressing requests with the given encoding.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.accept_compression_encodings.enable(encoding);
-            self
-        }
-        /// Compress responses with the given encoding, if the client supports it.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.send_compression_encodings.enable(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.max_decoding_message_size = Some(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.max_encoding_message_size = Some(limit);
-            self
-        }
-    }
-    impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServiceServer<T>
-    where
-        T: QueryService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
-    {
-        type Response = http::Response<tonic::body::BoxBody>;
-        type Error = std::convert::Infallible;
-        type Future = BoxFuture<Self::Response, Self::Error>;
-        fn poll_ready(
-            &mut self,
-            _cx: &mut Context<'_>,
-        ) -> Poll<std::result::Result<(), Self::Error>> {
-            Poll::Ready(Ok(()))
-        }
-        fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
-            match req.uri().path() {
-                "/penumbra.cnidarium.v1.QueryService/KeyValue" => {
-                    #[allow(non_camel_case_types)]
-                    struct KeyValueSvc<T: QueryService>(pub Arc<T>);
-                    impl<
-                        T: QueryService,
-                    > tonic::server::UnaryService<super::KeyValueRequest>
-                    for KeyValueSvc<T> {
-                        type Response = super::KeyValueResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::KeyValueRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                <T as QueryService>::key_value(&inner, request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = KeyValueSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/penumbra.cnidarium.v1.QueryService/PrefixValue" => {
-                    #[allow(non_camel_case_types)]
-                    struct PrefixValueSvc<T: QueryService>(pub Arc<T>);
-                    impl<
-                        T: QueryService,
-                    > tonic::server::ServerStreamingService<super::PrefixValueRequest>
-                    for PrefixValueSvc<T> {
-                        type Response = super::PrefixValueResponse;
-                        type ResponseStream = T::PrefixValueStream;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::ResponseStream>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::PrefixValueRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                <T as QueryService>::prefix_value(&inner, request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = PrefixValueSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.server_streaming(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/penumbra.cnidarium.v1.QueryService/Watch" => {
-                    #[allow(non_camel_case_types)]
-                    struct WatchSvc<T: QueryService>(pub Arc<T>);
-                    impl<
-                        T: QueryService,
-                    > tonic::server::ServerStreamingService<super::WatchRequest>
-                    for WatchSvc<T> {
-                        type Response = super::WatchResponse;
-                        type ResponseStream = T::WatchStream;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::ResponseStream>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::WatchRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                <T as QueryService>::watch(&inner, request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = WatchSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.server_streaming(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                _ => {
-                    Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
-                    })
-                }
-            }
-        }
-    }
-    impl<T: QueryService> Clone for QueryServiceServer<T> {
-        fn clone(&self) -> Self {
-            let inner = self.inner.clone();
-            Self {
-                inner,
-                accept_compression_encodings: self.accept_compression_encodings,
-                send_compression_encodings: self.send_compression_encodings,
-                max_decoding_message_size: self.max_decoding_message_size,
-                max_encoding_message_size: self.max_encoding_message_size,
-            }
-        }
-    }
-    impl<T: QueryService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: QueryService> tonic::server::NamedService for QueryServiceServer<T> {
-        const NAME: &'static str = "penumbra.cnidarium.v1.QueryService";
-    }
-}
diff --git a/crates/cnidarium/src/gen/penumbra.cnidarium.v1alpha1.serde.rs b/crates/cnidarium/src/gen/penumbra.cnidarium.v1alpha1.serde.rs
deleted file mode 100644
index 7a58283430..0000000000
--- a/crates/cnidarium/src/gen/penumbra.cnidarium.v1alpha1.serde.rs
+++ /dev/null
@@ -1,1047 +0,0 @@
-impl serde::Serialize for KeyValueRequest {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key.is_empty() {
-            len += 1;
-        }
-        if self.proof {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.KeyValueRequest", len)?;
-        if !self.key.is_empty() {
-            struct_ser.serialize_field("key", &self.key)?;
-        }
-        if self.proof {
-            struct_ser.serialize_field("proof", &self.proof)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for KeyValueRequest {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-            "proof",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            Proof,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            "proof" => Ok(GeneratedField::Proof),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = KeyValueRequest;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.KeyValueRequest")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<KeyValueRequest, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                let mut proof__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::Proof => {
-                            if proof__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("proof"));
-                            }
-                            proof__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(KeyValueRequest {
-                    key: key__.unwrap_or_default(),
-                    proof: proof__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.KeyValueRequest", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for KeyValueResponse {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if self.value.is_some() {
-            len += 1;
-        }
-        if self.proof.is_some() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.KeyValueResponse", len)?;
-        if let Some(v) = self.value.as_ref() {
-            struct_ser.serialize_field("value", v)?;
-        }
-        if let Some(v) = self.proof.as_ref() {
-            struct_ser.serialize_field("proof", v)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for KeyValueResponse {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "value",
-            "proof",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Value,
-            Proof,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "value" => Ok(GeneratedField::Value),
-                            "proof" => Ok(GeneratedField::Proof),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = KeyValueResponse;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.KeyValueResponse")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<KeyValueResponse, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut value__ = None;
-                let mut proof__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = map_.next_value()?;
-                        }
-                        GeneratedField::Proof => {
-                            if proof__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("proof"));
-                            }
-                            proof__ = map_.next_value()?;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(KeyValueResponse {
-                    value: value__,
-                    proof: proof__,
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.KeyValueResponse", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for key_value_response::Value {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.KeyValueResponse.Value", len)?;
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for key_value_response::Value {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "value",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Value,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "value" => Ok(GeneratedField::Value),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = key_value_response::Value;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.KeyValueResponse.Value")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<key_value_response::Value, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut value__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(key_value_response::Value {
-                    value: value__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.KeyValueResponse.Value", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for PrefixValueRequest {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.prefix.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.PrefixValueRequest", len)?;
-        if !self.prefix.is_empty() {
-            struct_ser.serialize_field("prefix", &self.prefix)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for PrefixValueRequest {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "prefix",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Prefix,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "prefix" => Ok(GeneratedField::Prefix),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = PrefixValueRequest;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.PrefixValueRequest")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<PrefixValueRequest, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut prefix__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Prefix => {
-                            if prefix__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("prefix"));
-                            }
-                            prefix__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(PrefixValueRequest {
-                    prefix: prefix__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.PrefixValueRequest", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for PrefixValueResponse {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key.is_empty() {
-            len += 1;
-        }
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.PrefixValueResponse", len)?;
-        if !self.key.is_empty() {
-            struct_ser.serialize_field("key", &self.key)?;
-        }
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for PrefixValueResponse {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-            "value",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            Value,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            "value" => Ok(GeneratedField::Value),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = PrefixValueResponse;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.PrefixValueResponse")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<PrefixValueResponse, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                let mut value__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(PrefixValueResponse {
-                    key: key__.unwrap_or_default(),
-                    value: value__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.PrefixValueResponse", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for WatchRequest {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key_regex.is_empty() {
-            len += 1;
-        }
-        if !self.nv_key_regex.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.WatchRequest", len)?;
-        if !self.key_regex.is_empty() {
-            struct_ser.serialize_field("keyRegex", &self.key_regex)?;
-        }
-        if !self.nv_key_regex.is_empty() {
-            struct_ser.serialize_field("nvKeyRegex", &self.nv_key_regex)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for WatchRequest {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key_regex",
-            "keyRegex",
-            "nv_key_regex",
-            "nvKeyRegex",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            KeyRegex,
-            NvKeyRegex,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "keyRegex" | "key_regex" => Ok(GeneratedField::KeyRegex),
-                            "nvKeyRegex" | "nv_key_regex" => Ok(GeneratedField::NvKeyRegex),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = WatchRequest;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.WatchRequest")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<WatchRequest, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key_regex__ = None;
-                let mut nv_key_regex__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::KeyRegex => {
-                            if key_regex__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("keyRegex"));
-                            }
-                            key_regex__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::NvKeyRegex => {
-                            if nv_key_regex__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("nvKeyRegex"));
-                            }
-                            nv_key_regex__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(WatchRequest {
-                    key_regex: key_regex__.unwrap_or_default(),
-                    nv_key_regex: nv_key_regex__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.WatchRequest", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for WatchResponse {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if self.version != 0 {
-            len += 1;
-        }
-        if self.entry.is_some() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.WatchResponse", len)?;
-        if self.version != 0 {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("version", ToString::to_string(&self.version).as_str())?;
-        }
-        if let Some(v) = self.entry.as_ref() {
-            match v {
-                watch_response::Entry::Kv(v) => {
-                    struct_ser.serialize_field("kv", v)?;
-                }
-                watch_response::Entry::NvKv(v) => {
-                    struct_ser.serialize_field("nvKv", v)?;
-                }
-            }
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for WatchResponse {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "version",
-            "kv",
-            "nv_kv",
-            "nvKv",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Version,
-            Kv,
-            NvKv,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "version" => Ok(GeneratedField::Version),
-                            "kv" => Ok(GeneratedField::Kv),
-                            "nvKv" | "nv_kv" => Ok(GeneratedField::NvKv),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = WatchResponse;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.WatchResponse")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<WatchResponse, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut version__ = None;
-                let mut entry__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Version => {
-                            if version__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("version"));
-                            }
-                            version__ = 
-                                Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::Kv => {
-                            if entry__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("kv"));
-                            }
-                            entry__ = map_.next_value::<::std::option::Option<_>>()?.map(watch_response::Entry::Kv)
-;
-                        }
-                        GeneratedField::NvKv => {
-                            if entry__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("nvKv"));
-                            }
-                            entry__ = map_.next_value::<::std::option::Option<_>>()?.map(watch_response::Entry::NvKv)
-;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(WatchResponse {
-                    version: version__.unwrap_or_default(),
-                    entry: entry__,
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.WatchResponse", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for watch_response::KeyValue {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key.is_empty() {
-            len += 1;
-        }
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        if self.deleted {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.WatchResponse.KeyValue", len)?;
-        if !self.key.is_empty() {
-            struct_ser.serialize_field("key", &self.key)?;
-        }
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        if self.deleted {
-            struct_ser.serialize_field("deleted", &self.deleted)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for watch_response::KeyValue {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-            "value",
-            "deleted",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            Value,
-            Deleted,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            "value" => Ok(GeneratedField::Value),
-                            "deleted" => Ok(GeneratedField::Deleted),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = watch_response::KeyValue;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.WatchResponse.KeyValue")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<watch_response::KeyValue, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                let mut value__ = None;
-                let mut deleted__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::Deleted => {
-                            if deleted__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("deleted"));
-                            }
-                            deleted__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(watch_response::KeyValue {
-                    key: key__.unwrap_or_default(),
-                    value: value__.unwrap_or_default(),
-                    deleted: deleted__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.WatchResponse.KeyValue", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for watch_response::NvKeyValue {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key.is_empty() {
-            len += 1;
-        }
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        if self.deleted {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.WatchResponse.NvKeyValue", len)?;
-        if !self.key.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("key", pbjson::private::base64::encode(&self.key).as_str())?;
-        }
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        if self.deleted {
-            struct_ser.serialize_field("deleted", &self.deleted)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for watch_response::NvKeyValue {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-            "value",
-            "deleted",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            Value,
-            Deleted,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            "value" => Ok(GeneratedField::Value),
-                            "deleted" => Ok(GeneratedField::Deleted),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = watch_response::NvKeyValue;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.WatchResponse.NvKeyValue")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<watch_response::NvKeyValue, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                let mut value__ = None;
-                let mut deleted__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::Deleted => {
-                            if deleted__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("deleted"));
-                            }
-                            deleted__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(watch_response::NvKeyValue {
-                    key: key__.unwrap_or_default(),
-                    value: value__.unwrap_or_default(),
-                    deleted: deleted__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.WatchResponse.NvKeyValue", FIELDS, GeneratedVisitor)
-    }
-}
diff --git a/crates/cnidarium/src/gen/proto_descriptor.bin.no_lfs b/crates/cnidarium/src/gen/proto_descriptor.bin.no_lfs
deleted file mode 100644
index 383649ad97d9ab3daa8efd3942653231e8e3d5a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 102050
zcmd?S3wWJJb?@!{?yFzPvb^Oaj*^f!%FRw}C2>+n94?h@IT5ujA4yI~PkWSYY1>wi
zwAH;O9CN<%9nw$;ffK?hH02TsUrP!nKxx0yrhWK&fEGx~C8wkW3guP`w2(9{kP--R
ze*ZNy@4L68To3u4KF{&v$KEsV%$hZ8)~s1;&6=6`NAD=a$&p6m$ZY+Bg=S;1acJrA
z1=ID`RC8uwvC$l~yy|*a!lfuNurJ=QXJ)p(J1sa~U#wml7Y>uTDVO9ocWpmwa9O3n
z&Kd{Q+L+ZCxUCrXt@5>6jSKU&IYG>AUOQ&LtDEBTLT&2BwIlUSk!6Qu^;vN|U0<lr
zPuJ(Cj&I6?#oDp9oa*`UhJ~d=volkZZN*}W6~}trhuvxQ>bddyWA)mL+lzKt(H>>D
z72Fkf&(&Kk@R?jZzEIy(u-+#tdY{qC^}Ng1nxIm3C|+BiUz&3eiUwgN{e~&A97;vi
zJcx3u-h9c-RDDy)0Gzu5g>m<NIgC)Rx(h6>U#!o!W*YOG$_C`@6+rgP)MuxcgUISt
zpB<MQ3yVN#ZK^OnUE5Dx1;lK9)Rh?vg{vcRZ>zD?oT^VwHKyy6GxLWVo7NhD(^mi(
zw}QJUH$t(o9#=7>t0%^#*75np+Vz{djYE8@x;-w}r)PxQrXD`@Y~Qp3^050p777mB
zRf^Xy>+Py+d3jtsEXu%?;{GQ|H&>^V@NV>;B!D);55-;c_10p2+HsNiziayw^I_~N
ztz<*T$WN6GUlgxTd1$g(n`fFje!gG@t(TE?a5(VZn5vESq;M=<-5tk``Fi6pQ*vq+
z-ddf^qbjlt^4MCdxSM*_%QE&XKL&U0bJKYRhaQZ3nsv=FNbGvH){q!{!k&%!YOZ7J
z0u<M;GvhR4(xjb4(%P}^P-;ICu>YlTPbYb*8{=YYvDREP;aD7ViE3}0M*x~+ERN}C
z_2;t==dHu%tU$LD^74N7KPO(-(Sax1^uQ+y@d>NKuD&SVxHLaAzgTZBH0xqnCo(pD
z(@C9`On0!ow8L<$uLFe3tX>m$i9c%1n$2@J8@E5XE)R-Be9fKtSLLFyc39Qt#FfMK
z+Ts!evuV4L@{|>D_qYNqhhu5s>RjCYl6rII@XVA$O5@P8{n8bcSEbe9Rc%$r7i)|4
z9r3~aR}GJi>=_x}?a=H1-~SuAxT~!v5{E1jhw4qwDn3;`C0=`YX?E5zom)#Q$`Hdz
z#@TWvTv>YcyV@UD0#h=nbDJw;Y1(~Tp!fA@)*t`PrC(U66ncvTm&6-Zbfvl;REKx%
z9U2>&7#ZE)yQbO`xAm?!ci!5{x5~Z$g+I~2hf49r)mEQX<#E<&^`JNwIz1E@XKRP*
zv#iq^g!5Mn!fGuH?p2jBSF`$jPa2V+XZv|i4ua&XCnIzhIUU_atF>blWf<L|ab0q7
zx*qhKG+jkfOxF+BmSz_xUs9W0s<TF`a<|XCN_o}O<1QyAXMl0NEuqCRCpkxyqhY_U
z)tC>m#+p}#HUFGUTDaBwwAH(}Tu4Y?GF|avKb32<n>K)5Wvs_#y9%}0fe%D+LB!C|
zPh4|gcyjmX!JT`Ddvh9k%h<DbbZDYCO4B3zC!T#tZ$7PX&}9_b3tYUtw}|lTb^u0R
zG`yQCrOq76l&kCFwN_^5=;+?wN(ys)Vr*pp6}@Xym{*LA9z4(+rx5lHkB<*sG2Gjg
zme_gC#PE1;cM3vi(Zss6iQ)YR_x1KvH^l3##qm8tixTUXWr1mL3T50u+0c<eiR!?v
zxM*w$yZ7uJ+Bv*;a`b>E&Cp(Gm*$NP9~d5*7~T!N+VcLx!I3fYqJgP+<7zA9s#B<q
z7bG3Jwy)#`gSDI&2L3*Z`&Lm_S8e14anbRzlhj*Qu$urGXD?sWUA=aF)2(kS^-Y0T
zj%4+hSFGkv;d%C|7%XdiP#`-N#j$h|e~eXKTF~-U{qlIj3P4YKb^Wzmyy>xsvnr`G
zk*ML!MB?SyoOcvFV^tE^AS@^2z#X~x#MSMJRdINJT$-yd9&H3Yd8IP4&pt1s_n5EM
zuD&^3S1}Hpm9qlVo1*xHRe`UH=xK30GrzF3=#*)<I<B=G6JC<CON;4u;exU0vaG<R
z8Bw*;bZvju3Zgn>mg8ByFz%h2ovF_+PPP`C_1fIb{1La>?kFCv&9>@e>)q$^@KrTT
zEp4{dur)ZX;XbD|2Hvwa?vlan8?T-bcVAa~No_J%*3RJWQr-b)Y}3d_D?%UZ%}Mm6
zR%>3ixt58wV^w_{)u&zIOZDgCKC3auf;F=+Tc4D7ptUKcLM33fK_&M20>Y?;o`0HE
zJ5ryoqs7%H>%X!@zb9++)00PQt)rVZ3c${2Q*P{J6}-Zi8@6IY^V3&SsJbIQ(V##>
z2sk-)v_AFX$)&}^mu@<xy?w(Fx=?19iX5awbv*8FV4lv+ycC=pO<O~IwyzXTZ4?|7
zB~@V`M(K{?_<`Z!-D6z=%AQ8E3PT-fqy+9Vs;xcJ2;_xWQ&W@HXB-q7FD&`irrvgB
zH%v`gXJ@ATjB7C;PRNMWUeOlcKxOOY@~X7BaC~Kp)s7YyjxVovws~2ab#z%&y_4EY
z%h}>TR0rYWsmc0$?GOWBYx1MD>2xbxSZpp~-Azpm+s7gMRy{A?&^UD6lw+((z#N{r
ze$!c0SUa{}AB?RISax*_uv<rK%>~n8S}<*W)7h@5%a<x+*<$S0v6;h*0pht<tjqE|
zw9Rqv!qJ7!hBsTW9`f7UMgLMsvAt__ixul8Gi&jZ_(T;#%GIW8i?z1WTdnj)zB2Re
zV^#}1n@fj|r~I+a;i<g9Ay3=<c*cyafgN#oJKtB=#*Xt*NYJx(jqV<v93T0`VRSiE
zv%Mn|!;@nN_fL%M8}7}wDfZY0=k=b?zvuLxJ0|k1V9J5-<>Q`Cv%LD;_#}qG{BEuK
z;^eWJrcKtlnzM*g3A53c!X&$zGE7B^RQJZG&o>a42$foM8ka)wcuv-)n0GB^y<~n0
z<<$8GwwD#omZl+JwAwi*v>2on+vfzD_grm(NwL^GZn`@L6dA)xSFeiC$)?ZbZ2d@W
z>iDE7>gHF%D>i=^-{oR!lVpdJe*;;Ky;k9c=<#O2><XnjtX8?hy0$+_tMwUUo6e!f
zG-T+Dy(RuF^_Ka!(z}*_*Y?H(Z(SF6TX)1|cogxI7N=w?nI+q^{md0>YJ2IyU0R8E
zl$>rq=4#3sMqs=c*<}Mf=2O)x;?i|3gRP~rXI1|-{ymS$;0wnM_}UkaPwpQb+c&g#
z%vZ0T92aJ5FFoG5W?L3QasAS~a|Ph@uu|*WnWZQDx)%^nmak}0PU+5-)v~IaW30nN
zOGhS~_37HwV&{5-cY{x3_NDp@@mjfJ=FM%Q)uU(ow#O&0BgI&#G?vw`UKyA1O&zJj
zt$padJ=<6M$T~*Kfts)?qU%_wUcEZ*^*&oBsoB0Q6ae}Dwmv>~-jloART^9Gq4;#G
zV_ux_ROZFOc)fQ6O}3U678<zVPPF<@fKYG^xjJJ#9>};$KXWdz{$Ip*=-k@A^X-ms
z39BdL2$xwB3^gsvF46zSDDLU(7!#=)Mhp*MvoXCi#blF4`FQPY@O4JgD(!$WIcKx>
z$pG4&=^_`zeE|ScWb#<8i8t{GJ4B|rwtc$VeL>6wc46MkHE{TPchO^S81#7j$6Wb=
z3*w@QpK2U?0fcj_5*K!jj_qc7WIc3ZY4X6x@Ge%!fuD;@PNrz-Or;8yT+%xzY+=>c
zgZp+4k5LV7Ts9A@C&U}Zh9`zuXh-)?9^C&6`$w;qXRRYUtiw6RwKpq0K6-G>uz5`s
z_b#85)sy1BiJ`G8h9@S?p^<?GM*D|7Bj(RJJwBy9clbr%G%lRRhW6u0iI&3)E|$Dd
zZLf)=bMNln!t(6V{llYsaQiH4-P|rE9Fixt!%*%dG#R@FC(yEvj1P}pHA1&5EDqK7
zO8bT<t{mOnyLPn|tJ>Q)aAyt$NE;50RGmUa9RKfXu^srIQQXz$3z4g^HapumHd&jU
zK|OctVQg7L%6YQu&y!bO%qlh0?Ww9RZnNg!m+FGjGVnPjO6r9PY|yC>iV;@T2irAz
z5&ubZ%kovdL*wjN)mK@poIB#*>0;G3(+2(~7x#EWHxRa+VgpZwVx1#$#$%1h{~tQ<
zz;ET_bsfH+W%KMYvHO*H!_0JjZlQsihH)@ke+l~-B16yimAk7QEewui_4caTj=quI
z!}|`5B9eDq6BdcF-Zt=7tV2sW^QjR08KdODfw*^hZzRxH=?{xuU%Y<*C`Krj=<uFB
z!@DNN-9|%NnvI5bo_kY1?ptNA5skn_qBt-0O2v4UI)k$A53ob)16S}`Kwk9g!!tP0
zoG#^5ko8%<Ia#Y)<LW}AMWn(@6bKP^do*zigsS*2Xi916d91%>rL{YiAL|WY($aVu
zrW=I8)IACk$vHMUEzbdz)5N*W9F~&3-D6!Y&lO?2r*`B>Q_TiI&Joy?W?RAj7si!9
z2kkt~Llc}Fwrw4uMpl#|BFR%T)0(usFN;5kl4x^ftZSx~?uriF5yx>*Hi<X775M-y
zXQ$=dX)z^&S-6U)F5Q+T3W*xHeyqaI7rZK$yDe9^Eth*oZe6u9{GtPUM|O=&Y`U>*
z>5+Xt{Y{rnzkjRz2e~|3lVj@)g8;8O+aAaxnZBwanPH=)Lk7>zErv+R5b3IxcI_P<
zAKq<ftgRMC4-D^TZ`?PT#r)isi%)72vm{p>-c^wTGBl=xcH6W4qLoHc*7%sOY9tx<
z6?bl1L6V{UyFD&oc3^1NFOW*HIUyj>0j2sfOkI4bVzL?hV2ZgB|E{`UnqegOD}3W?
zc%rz`feic6_>3f=VH@DrWN7rLwX7=b_XhV+N)oqWd;a5*#5<W%Vw}@PjE&Xxdx!U5
zF>&SOfw5uR%mW!eChL7;p<?w0HsPK3#vD$zC*HGt<#tEL&x7W?vC=y)vu5+R<s3tt
zRITnEzG4VTy>obcLXvEB%<*VkEe`G7J9>3Sh*+&UFW0~?#p`TTQuahCHf35p7)SIE
z2hoqH?2c3RM@Etg%#Wsy81)E@4g0;s`~Zt_U|*@`reQBL3@~`ayTHQ?ay*UAa#ei7
zs;tKb_vvB(a?;@mj-$KTnQg-pNR9^`mP|?GPvDNkJ)I1M#5w8U#GXqhuNvArvfDxo
zIsrK@qJtnR?&{4C6e_vi+`xFeei<uNPmMQu3k5r31y)9(4(0$oOt;;`dq?)+`PAm?
zm2sSnvDT~?j$;immivY#+VH}QYGVoj?2(lN&x%!2RK(5u`Tyqqy|2^%uiM{y>;4y(
zD&H*keycq2&-u8TaaQW{cu`!L4o(yorTN^)nGB)YU<Rqvk1&=(lf}$N)yy0*jNTA_
zVvE^V@GuQT?fMQ7Zo)o}(LLuXco6+RU`zC|kbPQCkNxpRtp8>cfut4lu#;3R>)R7(
z>wRq%Jx;CaPOVtiOIQa;>f#eXVu_(jfPrf?*BkL~)SJ&@j0Wz&5z`qK$wpdbw&6pL
z+-PrJG1{F~2KV~%V`<I)PvzoD$c7&a3$?|gcyoxF-5K@f#w@LTc0}eeA=7-NwNo=&
zuW3EPe?2#c_S5oim-Rk>m(Nyo?qahxGuu&COUBx<-tZwUydyq2z@26<h26dBtN{g3
zt{pqc7ufB;hq?pzM)3yQ)Y7V%#*FTZ<J$augZL^fRgPRM)w~t;28Ys0V{HKXznzQY
z?9*e?4GY}GuG-$HS>S9VyDaT4%IkKheq?6es792ZCGZ|ul%J^Mqx{C=N~=CsL%W<Z
z$8*p2m2nJ@hy38UuRWH+8Q2_GLT)M_*Hp`KetdWW*<@mBWM~|51oM@{G)52(?;cs^
zd+Ngl=`)=?>%FneqLOAF7#p1!-QN3+m6;d!ezQ!xOn0ch{le`RBjJ{1UDErH=G6(M
zE}A4ZXJT@6|K4lB6iFLCY;XGzu_t>{_;4A2p40a6t*<RD|9olN=i66)zO3!@+xXmv
zv&Hv$-_VPCf6AZo&X=*x+n8HE4R`itn@ScP-nugPi`#ts{E@~i@vwu9=8-HyU;7lT
z3$k6Sg+o6;gN^c69N78psQ(I!=N~jkMC%WZ)eq0sr^MJVy!j*fxLhrsv*wmK7r%Rb
zoa?UU&skI5{-N%~icd9WlbuV457(QmWLx3@o!d&ZlbK+N)SFXB6`Y%}EzUMtoa|~W
z9B<AXIl7o^zwp9KeT8IXerhmDhGu6I`_@WA*x+EC99>*oXzjQF<S|1V3p5m{0byJZ
zL1G(t3yBNjIAMcgMz+VHC3PWT7cN<9)j=n56UA~4&CJ)D#|^L6*5ugC;?bnhwEqcM
zh?6;#;t+qiHDNzGq2;-mMMOYCfZ9v2z^0SMqqRl;QSamyLlPzIx;fW*OO=3AU)%vo
z`g7hg#9B$?aKH#1yq?T0wHE35Vhv0MwRVUl0f?Srae}yElYc88XIjZDeH4WD7U^jx
zIuL@$i<!B46H2a*1dX-PA|OE@<%iGkh%-d~xA2HH4nlIeF|{NCZvs?9asl*j@THl+
zDa5c6!;z8N28fSw(mu9nr}ozwKxzuGEJP8;F{9(Hd0>ZcM)#S;mU_hIf!L%0_s-Rh
zCx`0d6o}YJh^QnNKusYrhYLmjLz6|g8|?7$Cx`hE1DDZgH4ZPbPf!mWl(ZJ=Q{o_M
z&4{s@;+=WNMJ*YugRsTKl_TTH_~@RAtB1yh6MiGtuEN!@JK1>+ABU4&qX(`T8@b}j
ziR8-By}O6U#uIc`a`8)#>^wLzIyN3B14H9f9k4G$`>#n*a8cIBlhLunG;*K;9v}L|
z$nf~qWMu!Yy$7WtZ%u%Z>>r(o6R&b66Qf(L*_HK@(LKq&;jvv;0%mCE2z&F_Sc7{;
zCibf_l+rjEN)8N-O^ob1NPKQ`;NaK+Y|=zM+dVQ)%r5)*y9a5XHk0A2@U17~SE9If
zb~H}deHb1S_U+wFb`FE(5P_d+il(mt=otPPbtwC_3*v#`-mP&$NX@PhenAf$S73C_
zRu6O>lSI26Lwl3mL;DEQ98Wes5mgwNT?fa8_X%rAF@A98_{7M>!HMDIiqX;CMr^+;
zFn)Q0El$p!<ly))h+szyS<}FPTzsbkI}Z}LDZ&xHIXpIY&>}OpFv?d$8M;11-Q7mv
z(f#VJcx8BW>>7a;9c%=)CRbm{jsxW(s!?l51ku*du8H<yGzhOS&{;o|{li!69l1g_
zo$whIn5##|hqo|bBj9$0V2aFF578)$Lc`)n@M4JcyNz`rGUJ(y>`8`pUj>lep)?#Y
zKH}MhO5+E2UFm5)7;pbVlngBq+t=KYycj{ynE!ddf+5(G&A(t-$yJ0~)V3hJcGfgA
zk>?H82!!|S$_0q^ZRQB#>^Q~8YxCDJqpvuMo^q_VxHWlU{qW&rcfB@`I7d#Jq-ohC
zL}qwvyyb)w^I4&1%<~rK+7Jp79T-9wELu_c+E@Yvg3O(8v(ms~0+{=vJv*7Ife|1$
z0n(b43W)?G=xK5GxWr5?k=nLwHIGv%Qky^SWuneEX$jSewz)odWH2p5%%2qI1d*1^
z;OuQKwzkl(N}P+T`ORxK=~tziKX1+Mcx@b2y4+8fdH$NMmYJ*O_0wf;U2~CTQb|8u
z=C(D@vCOlpdHr;mgKN&P%(JR_{dAcZtU28>Pp{_n(`8<~=G6HAruDVeJU{yvJ#Diy
zgKpu0Pz@g#hj>M9B1WOuA)?2$gcHu?6_ag;#13&%n>_+QEFPUhDmUiOT}+NOnlDbK
zmlU9v9BMQcQ3PrW3#1^)b#YW!Q!PAa&1Jd%|CCHHsEG8%hIANMZh?Vl+Hj!(5UIIh
zY={W5C4==@(8UyP{A0%ej6i~`vQ-yb#c{r{2C_b<a&p`i7Yb{lHP!s35j!z)QHg?5
zaY&U&bv-MjsCMb;XNFXs)H&zI+v2DQ^3PrK%enqD40)ZsNQh<9V)x?t#<BSX#m5-b
zwO>^G&n<SxJK{po+JAm@V*fU{bYYedxTB3(7BZtUEV?w`0YZ$tR0j^|sxFY8AE8#e
z6pZ!!jVHvvl{3J6+ZmnIe{*gbWRFc4N0!6mqMP?9FsMgsFJWzLCFdQgGuHL<pt!el
znE^FT!X`QnYNQVeKu4U=V#{A9vousx!sATmWPs_R*~y63T8jfI-Z{gK&2z(B6JlrI
ziSZ2_DWFrNt_1Jz<q{VRmAFHI$v`0EfHjEc7e1+PL#M5$6yBPkHn=WGahp1dKK5d-
zoy^QnEv5xi5Xb@869x|&hSLy`0`O5F6(eaZ={d@^;%U+$flOCaI0^l?8rz*Jd~qPJ
zgj6$54iUP9UNYS>4o7?(!eU-Lo)Rd6KvzbAKt>V>1j9lf7;hvx$<r=R!I89J9@>pi
z@O_R0VCMa>*4uN*aL|5DH)eqAbQ!&;S;xF)#yWCj+L5uD>B{KKhh~_pDCNlKIB6Yi
zEX__!*A&qRy3iRHEdY)vQ0+J(kQq>$Jytv3QXwL0>)RSlxSE2J9yG~Xpt)UZ&fw-u
zyIr6+`=cJ;w*tM{zu^Sm?P4`Q8lC7r6)8BH7A#V5l!Cu%^kLGDNB#W^$$_@%6nMwl
zU*vqHSU!v(W=&((tdf*1I=UG<<^Xf(b=-QJAdFgA8=B+-C)wh-xddwC(Fq|1YU7(s
z)-ZJCYJMW>_n*oXoJb3nDL9c9M8+SC27JK^1rJ6ihZF@5o_dC-3WEEpwBT9_UX>PH
zOTnwsf^ju}by_f{;MHltn1WYR@J}4quoC@JbV~oba~%ZqQa?zGrTIfzY@tP%BR+`A
zC@9U_@kwKTmZ8Q*Y^HPU5L07z30<MZ9K%x6N?gAly&R*hk<44!Cc)w?$FSV-#F?rT
zZoqvm$_j}zUq2R_PD$TIw|*%i*wDmE7v1`$-v0PPmX}<$c<q`Sa=HF9(KVd*0CyV;
z&Jy_6t{DJLi-bhfwUtxi%UC3GS|n=GDFa)b0wPmpt9XHl%S;06CQF)F!CSJ6&3fG}
zB2;A-*8Gw}3O25FnZy=Y8mZw`0%4_?*|n4V<MXUZJ{^jlHE>#DTE)QOMuX<{-{7HI
zlb`j)Dc5mo=4j(k+D48x4yA3VBZr7)bZz8l<It(6#g|wcP^ccA(SL5TpB|Y3CIu_#
zD-14UWp<RZ)7BzdtEa6+v{p}Bli;f3V|T4dR@F~W;{RZ+kvI}<?%$2=#{o9io}{ch
zwC|N9i3o>-w@1^n{LZwl$@)%F$%D#~6qP)v9O*Kt2~i{(k8H3>q?B4e``q}Yh6>fL
zi_YnvTaJq2FP|JDsFiyV2+o?_W<C`uzjHH3+>uoz;_UIkWH%fQYp}SaI2Ww(z#au~
zzAnXC0`R&Gi6>tHoUc3c?D*M+GX>|Ot^HU6NY};2!Zr&W=vaQthWBc6+Fp_N=299J
z5s!0SCWD}g<mlWf=lb@Fv^RI&`KB1<A_~q&+x({zK;}~*C4KXX5d{G<f4WnlNC9O2
z{H-1c60Z>rdLU(hG*TdCfHb<;FE-|vG;9oP2`PXywr=x4kcJB>kP1K+QXmz8EOedj
zt4UHWBmqbTAPXrFBxN&l+FLGK3y@|CWGz6NU11tZiZ)MjS|23=(mZ1z{vN^+f+0q)
zk1pu{M$V}`wpkmrPbQGXH^T<)W&s?FP9jE6O(ZWS<X(c0u4ycpo1;}bEWOEvD!O@x
zu_ZC+nvt_bpg1z2(?m&giLY~LH;0!{ZLmPtab3hPVMU@bXC+CK#|5~}vf8nNOXktx
zZ84)!8E4*=C+`pZ)tL2bntBbnu20DoL$2$)f<)0;a((}KegtC3b^W%%_;($-SW8|O
zJ*)pWMXq{K<UE3=AK7Gw2KLzrcTj3mKL(r{CD~`cF6NgE#WrmakIl&8<XXQFT`N5l
z#gM=N%uADA1}?Q^I%+!R>!N=zOZ(TwOnX@>(X^<%jO$8#N&5G)Q%;KqjT^eFg_q}|
zq+befhqkBzXzyRV&X~NrU=`w!EGgMl4auC6ef=SsSMs#e<1H*;QML4n+?wBI1v{l<
z1@jhiB2O|izKfL$5nOmht|ASwP>5K%3csF<PBEaQz<{K~fMiig`YQZLQuWuhUFnlx
z@as8NBnOF)9Hu|de`L*3GC<1FmsjPOiLNTE4$0)~kOb1Ja+@_Xg;P{5+>~QRyRxh&
zN(M*>9+D{}b?2rWliC*s(oH#LwSz?J=3I2X|HyKnWPp?h(#<)9ovX@%K=PDxLelDP
z5$6ggs=g+NymMs{(n<zM1t7g9hs5(=f%KXjBF`s*^qSoHTjL%<%CD)G{%bD!Z#m+_
zMAf{g`d``7j8BbAN@_@M$rVl;=$03BcBzFD!Pu>j%kC>p^SL|AV32MhtR>3;;4Qhn
zO<4vA+>$%x)U*W(ye?Nbg%*adU)h3&j?Y;OXbfbuwV>g9T@FhkAcfvQ2CUHI`@j&s
zK3BLPEg<@lk-^k3zCO2ZAS(gP*XPbWFUtVt>vISTHvr)98yQouYAG28fMts$LdQ{@
zb&F(wU<wv4k||SA_Kmsd0$-M;OUVF<wTooRUMyZDlk-AhAiXiesaz#$B?=tF`lV!m
z!~#Y##fcS+Wd9i+QW;3M<<2@gCc0Q$k*k*8nu~rrm+yabF0sSKlGI^GC0VQ;NeCk1
zdWY5^I}&!%6OVV6YfFSTyUbRV$hL)nbqAX&+`5wB(K;d>&goArx!t{#XanpE;a#`=
zi$uHJv$X}-(DAGo;H`uud5%Iktrl*7ES}{nl;Lw2eKHu$+cS<L1Aw<@JWB@jxjo}q
zl-O$FZI8vXrsC>z)`EEUZS5@x<+o)#OBGspTPD6L)xz6z(N;e^s1Ztru|$s`*|jNr
z1=ibhC!ZUVKze%)&4|O=k`)9o{Z1}AyMHMgDYrz+GSI%&(HUG1+Pdf*urOY$jg8!t
zN00>bZl^?*r9#SVN|~fVa9kK7=`g|~^k6OY_?=9Yqs5RUHr!1Z)EJTjXEE0z)XLHw
zxiw$N5!=LiA+dNzu5wyDO5gGt=y&C!9sNVLrkUdme;;au6n1xhOCGi9M!hA^2|m-t
zk$FzcCT#T72b1x--y!pO0uVfb=<p;7rQa1qDM?y?SMKzS4NsEb`L5ivFEde^mni-3
zx#+`Ql#-_Of6v7y#J_+TA}MU&lPf%{|8lnir<1@<B~+RzZh}FhknZHEzHFv=$!oyC
z6ljjeECZUpC-9hM(EfXJeJ7g?vkdTkPY#3Xr5+&)ygyeM=)cYok}vT1Hl1izxF~KD
z%|@^PWOx|w45|XUp1F`1^jhL0A5hG&AV8jdEi^M<+q{ed*M`63I*n)eYmU4>w~oDh
z))t|wIr9G8#?!J4@PB_UIU|01&UXO8{sAU>|LdI2w!8;YG#<Yj2j`v7Eu4-WRF$o0
zEgA~*lv|GLsJWuju3As!Y48Gz%|PjTbw*RlXy}F38gR_|i496dTR$aCK9Jk!R!DUm
zOOy;&NaA1|=aBJdxx(rFAIwR6)M4hW5P4dc`@rex9<pa7bjoxVuFgknDG673ES8O|
zF`p^m9+>&Z4ih9J*MWC&Yv#yGn4!<djv@tW8S^fO2Qt$*?%1?wBZ_n%I+PIwYnY66
z8&a}qqW@Wr6E%U3*u-R<_N@5TfhfTEa}njGk4uvbpTMlP3j=@S9S(7%DD|VL!Odec
zIBKO2KW?pHIkk02Dj3LQ9l}&5qpd?&%Ve~52+2kU9Xboei(yAje<)X2KX3wA+4(PQ
z1CD~ZNZZ(S8I?kad?>fBC(vcBq)cZ9lfp9IFZrJrcYQ1u?dg9<&YS@1SyR?O>vFTT
zBiTKw{afwH4JKDJlbO|?XRrx$ELoG7m<b>GfGvlMEEQc&X1OgT<NoXGQ#dCv_);&!
z6ry2%X+hpqW(&}r7wr(Xps5A{Av_R4>`FF(bDBg7e=LX1tL1?XS&vQ{2ubMpvE12C
z@8K&;=f`sA4m*O8+@SR4-SP8`8W886Ty$3d1<4T1@13e*QGEaKgztK~^X~1m6f@0c
z>IclEH{O%$I>DnNTHlj9(P`d!o5%O$&Nwsvc{R<pQR$Pp=zpSAU1;*w9m-`2Yd?--
z;kfozNLy2VLhITLDtt0m-W2bWT(JG1!l!eEjr|upKTA8~+PI084MZxb!y*%SS3rOY
zl=Y6KlmU@Gol~roZ-xT*<_caiQ$Qm?hG#-$P~+a*hH8xIAf98<{%kI~KX-Zm%buXC
zzJu&7?;hQeaN2yq=3m(0LFTmG)rFElJPC)z5>BMxJ#dO4vP?@+t;qpvP3r8XvOu^<
z@&<&$u*uf?Y_986KWvgUpUs`-6m*b>p*|}G-LYF9hPppj+7Xhd+4tu*oZ|T_FaEke
zciLs~FG@XO*8goTI=O#evdivMVb27QvE!~}ir^f!rBlU3u4Do_6v^R73t^e6zwOG2
zjE=mv?*2Bn&Z&K*z?!5phe<L7f15jDQ+zQ>Q=wY=Qf|#hqg?;l9TvD#{JefqOWSg`
zxFpn<a+Oo*S%E*W>z8xUPrW)rn$KU(mAm3`xWa8l7QQCt+m&1>H%7YTXiX%36<?0T
zs<u+}`B;6X>2_3DHqg*my9m`{cZJS-W;CF*0#wJ0mO;P17MM{P6!`nVjFxs8ju|b3
z8h<ZlJmwK4{S9jLA4&G3oc!X<kzd48u?T(JOxo`cvILU`L*~Wx<f04lGqJj|M{tlu
z!Cj|iw}2%xhp|IKr8f7ER0)$}TC;?SaHZu8H8~T$A=EUpR03A}CN#9EXK8AXk#(P4
zGBTKpp)+vuKmE))bMf{k-x;w7EoYs<&qGFAXJGzs=L#pJosr>7MsJoujc@1rHm2QY
z9)732h74RXvKl37e5btzv+n_xhZLj?Su)mT8Ps?n*SjHYgX#NVJBjhTDkCFtg&Gfv
z#2=0PsIU}&Pn`WnQ8H0GvJL%(dv+9dksdUHv#)42mJn7_F-^z8jVE<XT9w;!^!q=`
zIn0{tuRM0!{R)vxu529B2GUj+g>o@rZF5{%lm@h=`%-KGBJ!kW6A&&n%nTiqlSd2*
zT|}bILSj4AI`L#oti{BAv^mcPQY+n`cR4Wj$b7olD(_?6*JuOB&L{GVrroVNcsplm
zR`Oaer_#ee*M`NkZ8FQQgOC}^u+2xthCU(@9RJ7F!uNB96WKZ1Tc1C&cyx7Ir-O_C
zR^>DPU^|eEz7ygzJ;1JN;RhPJzGOd}ZY<{zSOPZL-i8-$QkBZ^V*8B@@Cx%1XXzvD
zjM+^MGBT#=rp6;W$sTH~s}_FPE|%6&gN%$Z*HPn#x!!E<_f!i%$`wvZJJ&-EGMo-9
zVbDX3ALTZln6|OLT6na*#(HXyk=0mFjYn1ETu+YPYT?K9W8fqSu~vudLrH5R2_efW
znRSo@DrC^X0E%_)Cr=9020&3V1GNEAKXJ4|=pjc+FOQ;|BIj}>P5GBc<!<&8#T0m3
zs)b*R3McjVKjy;X%quHPWeNv@KxG>HwdjOEG;`J52sBS-($pX$t0Cp(M%DO)EDHf8
z<5fc7&zxE5H+ZKLyTwzp-JBihAxvP?8GX>1dC_fZYihYI022qpKBR#uzDQ^@JIGwC
zGo$z|3LPb&Lgvvb^YL1ns_9w7bdIId(llr!0@t1}Ex{~A#H2$@Z|E@H$vW)%M~9_W
z6h!WuBky!4#R5apsY)af>NiK;=}r<@H%H#-PLlQOX4D-IiI1;|BBxg2+6NNJ07>@!
zYa(_JrB?CP3U4?mB!TprsQ(lXi4k~hh7-su86ZjPer*Ox{d;Y+!I=j*ynyst;q(^i
zqBt|Fg<B)iuXVOF^4jjl(l8SE<ab@Py%hXk<Z3Jq6Z=I(w^3ChU6S5vI(;*%8|+H1
zK$QY-nt~3d5eKWgM*RUU`8_Rdw|p`@jttUFK`%|xwOgaE_2DaByEW?F7?RePlQzYF
z%q|yQqwZ}HTROiNnQ7-mvT>Z;5QZ`yKI;PAm4t71>ZnJqr{N1h3%cJKZ4DO`R{gny
z=i+F<p+hK8r+0{Ysl~iC*>(Q;+ob&@Eke!BL~Jf;Z(fRdU{MS#7g}yh=H{6}+IG=d
z);e)141vD6*3A-=gCXq|uv+yRrvd8Iwpz`%JIYuRZ4V7euT{BWomHd*s+#<q+`m*;
zNTZ{=%ylT2CSlFnGA5U%b6dngK3^EB-xfXV^!Q~)bjrRZicTkHXHUB;`w8gG#FSNR
z3O^f}BD=^MOKon<DiYi}Oc&*K<5Ue75o*m&xh}<Bn++fka4#A@=>(O|^_B=XgTq~$
z4R48XGTiDo2KIVKg!y}e;~1EPIP|H&C<<n;xmcIB4d6wP22H<B>C9DcsG9PNE+k42
zDJe@IIt<7`H6Vr`u-hYvrLz+5FgFD{+DT14HKQ+#V=LJ#XEf0-wFO5SxvGfKVhCMh
zQq7kE+Le}fXeDM8n-ZTq|9Qzp+b=bK^gvU3YRd(h1bUXB=Q}c9kVg8B$h)Qs3K$?c
zaAtg?6E3Ku?~I5_d5PqOi3GXD-Bg3$>(@&n)L1XLuqBMJ@4eVTqsw|=pY4wM*aAo3
zjtL2KXRh%>rkb`}oPz+>&T6Dx&|VK{gf5in!aFnhC>8mg(S{(Fwb%2`h(MPgx-Os}
z->EKqJD2EeXq$ux7?`)$?Q?snsaP9Z-rD0{iOaX$eDmux6YkBl$kJLepyR<NI$;X)
z%7ed?O4dWoX7$NFK@J-}1u#3UR{~_PUE0_h$|TYyPjWOP=#Xp%irOaOzz;H``^guj
zRoA?iOs&~ngb=2L)5Z#&4}_~gxI444m!)uLCI<-7Ao(l>yh!+BB)pfY<R_XoI7kLa
zL}`%h3agtG;rB+H+y)0#f%IN+(eJM{P-ww_8L>t4_O(VrbMFSBT?=}|KyW(}QhK#>
zx_S*GWs^`sGFwIfftw+`0KbWDPH0Xemd)AVDv1H1h6CuprI%@ItevabaB&s<VmI3m
z_bT?>u{J*yH(#5j*+xQCaKPH#8><Py2s;r1DhAnZ#B(u@DYJ{!_-H^Gww4b{hLvC=
z#nv9JbAAan(u8us6)TaW_plz)$j=(iEYvx#8BhvT^3zK<##s$TKc`K&7PjE&4vo4T
zBzFCJ9h>svI*VN4`|NRt(zFYtI^u7MWkEik3>_F*4Opr?_>fa)D$2z*fDJe6dnyl!
z$-S@`+F&36mk(Lk>6(%Oh`~t1;f$t_O~m!zBDxq&pfSHKxR=vK*1-+&u*N~@sHFz0
zrjyyEj8NMqgqCM_92AEa>&UF6725-hnL9bfMAj)LorB7lS<3{n9=UEK@6An$qHq{<
zVByYBZ{v`ah2Yy%Z#yzEXk=low-^+BI;;{nmL-H&^lACv(#uwZ*hFn(Dp={rQFRQS
z)6x@ke&grmbTCXQh+4r3Ee7kjkHh0IEDOCmXds#7cO>c5xtfr5hIK~kftyP}NPTc3
zgJMfrk+;IT!o*m^M<$2yWbiuqQH*gwClI!K`H5G}52EKnRwcSeTZd<BM+kh*&?8EE
z7CxB<dq0eE2E;VLYdbG}zcv+|1X)RB1#uT6IR7$JTV<yIWz-wQ9dTA9+0PxoHCe2d
z?vB=c0@vim4%cK@(X`7eCFbr3PoyMmQ3lFA!5AP#(<EKfBx(AdAhStQ^`2m$kfiB*
zf`L+$rSMllW|IOE$pA@FL4OrwHeao<m)RtN^jDJE=hBH%we;y|%|FtKliNGt#?MxD
zD5aiAefV@lXs&uvQcvy;Jt0N=BwhO?>B+sJCnTwQZ|Dh0+P^pSq@<qwb>yRxNCAmt
zfTW)Mb<}mHtxbHj!e=@EHc24;b>st3N-_rTiwHK9!bl28Bm*RwTK7eM>xHjCx-TN$
z&=&^MeGvhN?~`^}(hm3+qv*>~zW?@Um9UYZZ911}TY!hlK<ix|gMhHr@k$h`cI{Y`
zq^-8w1xRaW(IIm8YCDgW$0h)CKqo)#Y=x-}%g#)3XxW9bjM;f(Ym&NJOQ}jV7yd+G
zH;ajZWtK`{aXP5k;E*OF7g3O^%9N4g%%URM4!d}}cE{&Xu>CZGV9@i6QGAL;u8<Ui
z{9Uwaw3U5jaQN(Y87%{r`Mb!+LRkg?|1R>;R+hmK{axgvt&~B5FGUt@wLG57zS07p
zvle8vf2q9%G1HeKA8ln-XyHp@%y&zlEXm&fdK6u_dgRb!vOwpDbTIKeO8w&y3Om)5
zak}A3c3{QHcI=Zdjv>6rGZxYfjWCNG0#~{VvVq&RFZA`u?+fvju6{i_%?0d{w4M!K
z5YJjasroIMQvWGyF2m3novQ@bH0w^CT{V7&Zc0t_@l<UAG$n26sJVctwwJ$^$qHGl
z-wIX=g~9Y&l2sQWtIE~VccL}_f~@L1PhgWSn9zRd@ls0`!*`;J({#&X$_IkfA_XQS
z9VR5f<bi+*Nvb{&q!vjqc_2uwvY79|;2<IeB$5G=Sna`Jw(!*odj}CoAUzlyL}f{>
zha!%`Nf40&63GBbQtP3p%Ng)|1=2&&sZPX^1kyth$KlR`I+bead(oOlpw5Zyk{ngW
zZo~HkktOiGsG>OQ0=J+*knabAkfL#tu5prd<NJXiB&quSKoF8N{{29ZiZFXP@^N0I
zfJ8Dtk{EwD>PoDWe6_-7xHvD8KzcYL&dcEhL4FYV=)Z~)gk*pug8U%z(SLje(hnjZ
z{YMf=KZuC_)9I77)zYKUnpfv@{R15Y;T8g(&~WB#CvjxlJQ@*`B}CSWI6n@=Aw`!+
zIz&i9oF50`kfiF5193=#$d5&w-;^j>D>Pr8$2284cSH|km}kqMtd!;AW|>*bOd7N9
zS9Pc0IKY>J2CeJLmJ9vV!{QEwnbyT2QR%F*Z-U0{EhX_Ah|w!B3%wHOzC7=JFnl$<
zIauNg)2o-~F}NLl7^oZaoNjU-#knK{Bn1cEkU<g!Zpd>fh%XGJ8}bA|IY^{#%ttP4
zd9BGZk^z!r*^PN0B*<4F-Izbw@e)a^d*)g3un`(0UYU=c)Bl`gBwQDWjOAho+r&oM
zM@{5-Y<N{8<a^q*LYop&z)6#I=9PKx%v`I3O(c5*3KCMU%!7jK8#9sQ+0PD1JS(rv
zU-)w#K_K0<8iFP&74o+XL7%@ILHW*r6A+Z|?4}Gsshu}v2+DVMQ-)v>1aHa^EP~)o
zLhyY(%$m4bx--A#_X@e~`;+JW@Bd-n+(j?O+wWbM49j@+9ybdm@JGn)c#$oY7MbR4
zs@6bKTXgpmwa<(=xlVV3WET$MW=$hMoyB4|h`{tLLcw&MPFl0NY6Z21%S@OQs53ew
zhqa<b)w{A1!WA*1wejy@Naey5oLN}n*csZJnW^#>g#kgXrV$bXw0eXDX8-aCiF$IL
zCrukH#h5Vv+sX!2@;Js1-ErrV<$>UAwK?86i(+<Gr<I1~Cl|QFl=Q*trB3%m<wOc$
zWY+N2$^f<~Q;N+=IZbUk7s(uu%-q+6JIvy)>UclUyIQ={!x@Dpe{4L3fq8@F(PGnK
zs@cGGBiBHHo{>PITa?H7Z2@eu_9W{h!WJ5C6!g6<bW6ie`D1lXA<s}!A$&S)s6#k-
zF*pTp+_BJLXsuBj!xnBme;zk>)~(y`#$pv>Z6hGpzmZ)-Jsjd((ijWlmCkq=jTvJ#
zb+o~882P^4l{l>(G56lc!|WV4fp5({7^04)RHeF%92`6@EVZ0%Ht(?JAaerS9)T-g
zYFS&w#6m;oIh*hUzHeL>Zr*J*LOL3vcH(+%B|mo|e*|UmC_V|i1-ifKGI51@4cxZF
zan46UbfS8AvyqYzQd!;>cca5FBz|NKv|*9TR*wM=k;m*cRI+o3Ew(~zO|<U2qlwH^
zbmag|Ey)k<o+!qnjy1A~J%!t28<xndo0)7`ZaXsDI8>Y6mX094p(7Ye&Esu1YFOtv
zK<YHqY_!9u;^0yUgZYMay^*?Zci&v61GDCswR<N7XY`OV@zZSE<&W5Iv95GfIaWW!
zm9+I_v%DrR0bfNxZ1G3LnsS}bbI>-i(_uz-Hde8(lB11dMs@`uYS*dZ=S7`Ke6U4?
zGdOBkjD2kH5BGxrrQP>k8ngp%vhjT2TuRx%DaLgU5HK<ThL#&%Im?$8Eh;h-7p<j3
z+q^VXIIR;nyWETj60Ri*;VN$sa3r?lpj>0h$=Uk#H3f@kawJdnek%cSNBz(A%qAe_
zyhm{G*r>wMbPUjz0w+Ht6A%`Mf?}L{=jC2nS}^>O0o;S63q~aDq;lC^Dz1%`N1S6s
zE}}d0l|FY?F_zZ&2l?pC{(s0Rwpjk+dh$Ys93eBMhqooIm{1sbEd?@U>y!8YgSht!
z`fUTmlaADDr){ULFM7k$_6;4+r+}%c=@YI5Ajw~@Vye%}z1e2kBb?kiX_7G1Z-u$d
z{ZMn(ZQDY1Y>{4_5G;SMu{s5WUZaoD?KFu#@&`ft<0~}!gFJ7HOG6@wKJo{7ye<DC
zZ%ZuQ@UDDxe*f1Zu0+!X7hHBFve`WI>cTPIT!JcVq%`8SlMdmh3hnMxxnYr6uBeeR
zcp%;0;PMJgK^*9rPQ7^xi;`IiQn-)F<0<Doe(3BJa5~ALU1!{FCnj*DJv0`CnS0Dl
z!-E?~k|68@Yw1x(>_VQDN5alf+}^>IZ`~8rjIiB|pxS=b2qa?$KsX}=OPCu1>HW|=
zO)_40W#c8i|E_%1MItjkjMrUx&g{K2Z{vmH|Dk+zdH-+bHP?JVmEXx$`)-VMi<{?e
zhQ~%AFgr7_RY!x7XMa$XaaVk}MNB$kMq)2n5c8~FZd1Y=ZL5>qK{9=DiNyhQq(}J8
zcxfDHM(1gDUP-n<FQb&(ZMU=dHgrbB?BzZhNQ2(g<&L_pvmw|GC%)f4G5H-dP1Vww
z`^V$EcD9rMKAb*(Y`*hX2Dm|%Nyb2hL6%AOp<pD$W;=f<-|L(SBpKun<<D`B2$C2H
zAIfiW!NMdl5<Zl_<T8%MYQ|FbFY?ha$6{><!3#$1*=WxJC0Y?#4heatD4Qlh;x95J
zWX=6WzSo5)1J?jwxINSbiNDBSyxZc&_^OS|zsO&*EB>@&L_pu0kDlNEKk~Y5$88>n
z0_Mw1w+oQ|+Wpfi0HV@y`Nhq~+b%^#<Jm%~(Ndqpwrnanb<y}$`q44wJd5E}-R<|X
ze$ULKPR~qx5KLm*9BJFYwXj27IOEn0R2v$E<#7P3De1G)C0(RA+{WwHI=;daQ>-<|
zB(=baTWSz}UimftHP^2rHK3&uLheO2eiYQRv|v~AIDWUqwKg@y^)FH&bsoWoW*W;$
z_jcPQNK|@m+s;fAqXu!ptXpA?_sRj-rGZ|$5yYY)Y-4;L716FA+96v4{etn=^fE=x
zQ`|=8V&AmZV>)K^C;CeRpiM!?EV8>9(KHFO+?z3r?CyK>y+JI=?!Gs_#d$T&14eS|
z^8zS1_TKz+o*VBK$0`W?Gx_Lq`F#I#lPl8sXj2_3N-qLw5m)a}y6|py-4={treKTw
zfTx9!e<ok<i+2-f2XL+W_vH&c1DB-0sU^Jz31`*CVBTiKT(cV;gZl1b01XNq1k73s
z@v{s>?S1*~b@3Ix9SVGw8P#8MH<1inU@_g<9i^ijPl4)b{H+&&ZY2xh>4Gc~4<r}W
zX&E&2**xLKp()b$=ZUy{PJ5S->71N~i}$(b1NTa)wV*P@85beo^>z0nKq>`~3$oUC
zAh}pq%P`PHPs{tmO<vW)=UGntxXH6YGO&P-Ab&pZ;}0kctk35+IbRD&Sm5*dbA!;5
zXXEpk(2{54^AcKLb9x4#zJkN5|1(jhnq8qF<aWi3S!(xMW<vXk6*E@BhPw~d>1FLe
zee4H^2QU%ZghYBxswuwPWchPJ6$Yciro7S<FmpHAf#~8<A|mWsEW30S(<<Sn*|zvK
zttz3Goy4(wC7j*gu041#EROTqv0eqra$MRp8h1skCUUwEg_#j42niyG;ZqROS2D#y
zyNF-Odxv6dK}cW8pMFMsAB+MgFkau0V)2)SWZd0kWTP-M6_j;_g|;oH^s6p)L3jKv
zp<BNoNd|0k&k$MR)dZ9`S@04|>0u~|V-z{&BN{%Qon|t2U>6(G_(bF!VJOh~sg&^m
zmJg)G2_mD+Cba*ii$0d4k!;qUv*=TscJZ><<No#~#eI1cQw&+=&BSKhb@o`oUmOth
z9N&^1u1YWK&^dHs2r2I4!fm-&9=?m*U(uMO#xZ(f8l%qXhF9G9NnZ}vUV^X!0XNe<
z;^-e*nLILHs<l(p*}IQTQe4qEnpj{VB#TWNE!S|X33MODdt<b9ORzKc>DRn#wVe&z
zMOX3yrR$Pg?{Q)=x?1m3mQ+v~Y!z5iL1o{`78Tnf%G4kQm3=2ugUU#h?_?6CY#fS2
zagvLV59Fh;;wT1-WN1e*SPx|FXy@gDe6MqIbNM6fJdodfo|k$R19kp$Ly~qL$UpmX
z-wqL44`vcl5n3ceJ34~?VAhT{F&@nNqX?}Bv;M55od>i2tfid?B_Ypei$A8Bf6hle
z1JA-S;tp=E_MWWnP-3#`{N_LByVg03?eu1Q5)p4n#SX-Tg*~L50;?EP@u56d5PesB
zBQclz6duk;+xx%H-iYiz6e`o<GNyb1_r{vzM+*<!AR*^o$dqZkC=Et(mx@})>qugi
z&rY#0_svm;D9|#jqbkQuNi|&%U~132Xw)>t4=EFtZ)O<rU~umA<)OIh6W_>@uMl-j
z)A&uzZuYCXwG_JG)IOXXDNicwgkFa+RM^SG*%->F@Nk}6)SOnNu#<=L+)3k;jN!xi
z<f4#d3?I&)e<4?jikzGq`Jpx#ekE~FL_1Sj{yJtfbDy`Q4L1?d+5f?n?Yig5?_IfG
z&BRYG$;8YG^PidOJs2V>Vbf{XxYkD)gsyR~4@tjw0(x}qhhb}iBwhPqp4+xu*ShH1
z5A)}^y%WCDwIAj$`nmY^j#W6!@{@eDrT^F3d@GIMeoLmjvCqi!=!4he=?-asU!vqb
zHeg$ocH=DVkPF15rd#tw3JGX3(00AtO1rDug+MBFx0~+%BwO%w+~y~F-ez(A>!!Ou
z(QF*CvEr!B%L`o2cDcI>j)mJ!KdmJ4<)K;A?ri9s(vqUF4m5xj&{zi=FE99wyg1Ss
zo|hM@Zm*6cXuQ0@y=)dt9Y-ACd1b)`Q)e!wWL$552VAtyIh#ml3Nz*j%7%2nT_G&h
zB2Az=ek-v)!S~c94qtZ{Hi@i<m}axcG}ofSxcEU6V6)aQXdRzBgd<27WZ8*kA1m5s
z1et#e7B*GL6fb`XrkLHzxyS%KBiieb0sWZGq^$%3_CQZ)k|v?&D>HiPgwrbvsY9y=
zdcLy2`Dg{!#}TKSZq~3aWNIdY^vQCkimsStNUjxJx!b))Bfhj##3?VV2X_z%xUUEI
zn={;X*6QYr7uJLO&Ekds&&@FoTD`772=DuHW?Hn-TlAZ9FBoW;q^R0y1PPW^k>(;k
zhoXfYIUHSpZadU~zEhn8KbaaFWU(2O$QdyMzAU|c16y?<k#?S^PSt_Xd7d~WnN9?q
z4trg}N5RKYFP(o~fq=eyT<19&_J%?<sPj?>0~2}Y#*^+mwpI;WoO>>vfJEV2F;Y)R
z1^F`EGT2TCf6;&>?h_MY1B9S6fe;%Y#2Yd~=xo~?3OsS`1k(lx@rJ_r+u{#9LR71T
zH%TJ=;S&)ej2Ar6TtZ7;!MRVG2~0zG=a@1ZroH#hr?4s;SkoSrloP5DfKCJgR3X5d
zG6GZ~z?-ruT!jE{(iGP13USoOMNI1d)4E-O>NHLL&~zV`=UWT@b_KrD^ji!5b_J3&
z{Z=*oe_7KTx%H^PRY3D*5}I%6DO?4_UH^Uy1}9M4n-by~O_+gEw=XFB$nD95yFDEv
zYy@+f514NR^S2lL6>M>|5zOCS@b?Ch1oO8SxHssPIjMON_;(9Ly}UHt5qJAdlHX75
z&VZ-i3sW(5!NBhp`~?HCT`)k>T`)ir-Sl@0Trgm|DN64h1-sOkahLLZM<G>e<s@lO
zQqhvS&WUIA-d$Mp!-BicNoviz3zZY&&lMTOF8PB#Sim!RcTsCV>VI@A6RKD^S8!2q
zq^MNeab>5dhRtU5MwkIX$=|TxS&4L8W}DsX9B#CBtF4CHyJ-S+Q-Imm!q~coUBkBf
zmeVy;j3VRMZ9(8B<jBhoZ4Kk7){zTruERX#F@xh^t9bwq*D+tinQ2_^TG_#KPOH2r
z(b~CY`$`^9F!I`_3kpZi_RD+f|LoW<PtxLh8ja*X%TdAJxAVk$K$F;glcL-tnCsm5
z^NiY;yRxZ+qLo~t^@}&p?8~pl9Wk{TTHb@{Zb*U*0X=iXwk~fYs0>p@kXX^I9rbev
zB{R#>`e??n6q~f)@}imR!S@5$cIPmoMmUQ3Q7wwn;%&9f&He}fF*?i7I>@R>cBawr
zj!iIx9G%><>LP3wkJ+9#erTKe7%hyE<ZfLLD(DcB+zR3wvkW@UL^+87XCokB?KH`x
z|6swZ_k3j@e6Y~#Li<P}AU;?iv`@l?B<lSK3*JRb67~Lr1zfZ|_@zlh-47SI;OC3E
zWVhQFbH<BbQ``o!p@(a0ews5t2`^!XSdYzHh!>jDML&xBa4rPss4LIsxsHW>dw&+x
z`P3N{bu^7jF~5(a-5jU?Oevj{uA5#i>~%0B%|$q0T0BL2Ir~U*rQjF!lL_YudjpPL
zOh@WKk`siU7TSTMw`meOemJ9}B+rKnz3w(eC<7foT-fgJYa<CAKU}zEIDmqVA1=IL
zcl@BEBVy{~h3KOGFJ~5Yn03J-txx}qjcU=-H}VuMX>Ul2?>y^Dw6O#ISeA5{Fexdu
z&qap=DdkZ9ct%RG)yE6onC`NDu8$WuNa|Qp`&=I{oPJ?QLduU9&bz?YhA!5IdkRsX
z`7OHS@VKYY)$K}}!=pV3(JiS3s7vd}J%t{3`kB<Sq?P5XD{CokA2Eb1R`i}imJDBi
zyJT|&M)+!h%YAPxNr!~$ZdniG3k8|^ozV-KN;X$pV5$=eV>VWB1IVk%wt=y%M9Cgx
zOqSyUGZ4hJh3Ec4{rChjY-@6r9>mbk=PTd6o{QkU2-!Lz>7j=|<W>xGGns8PIKiir
z)#mQb<odqa!X9mi4I5fs!naF#z&n&X<a$;D*Q!U0hjWg5B=lK-oCu^yim*TZ`MhMi
zUm;it^d}Xnod_-K9d{ltyV=Bo2ah(0^fE!p5);U6;zjih{pZ;hWI985FvFC2+(z^G
zrgX@QvBCMOdE|Xt!K<xxOYf7|H~Od{4!1R%V!)<L`WB3i=b1;^&UU2xK+gZg7NoW#
zEKUfZ_B@QD8`x4%yG}5Qg)(vk#!9(kKhK_X*_t~T$l7Z){gMp+ZQBIwBo4XfD1zEU
zA34v+xv$#w3P~}u+`KDcP4_a?oK5HkLf>C6p_ZHz-mOihTHv<BCUh!tDh;&Z%oGXI
zKsQ-^HIoL~aQ<qc*IjAbWgE_4EpU_MStziY?|)y2)^W**_WZS-g?6FG*APWSX*kbk
zmt3lUp9um%Y)>*_EqS_!_;o?78pQe9d}FfKniS*!3~axi0n-*|dlF!l{5x%UciHKH
zLUf@2Q+e;*GwRQB9+vZhnC8=Z0aW^i9e{S@X(m)y19c0OX_C6}qdCQX6T>fd(&jXS
zlX+;`x2iNjwe^Brb~>GVK}7s&tKr3_3VB}Cf*3CEup6ja$+hXZY3>Q<aVxFU9ENmZ
z@Yznb1Gb%Qa~E(UVPwcIV++`cXhE?l`!&4rq-RoCvn^1uc7z=o!h;Vr8@!|CLP80%
zSz_;ocE#o1g#qp<mh|g!C?+hp)Xky7?C|7HYZG~jr^})W{4Mf!yW2F!aG@&k<}__l
z=cXwhCF)ie$eT85?-qoe3WgVEcqn6CosD@YV_osaLxo=F9HlU9_)y_8w{J?4h3uii
zb4M*!LP`7ly!~d-c4<xg?$b7CsSak;50gr}vfm8`EnmUxyTPC(Nz>nzL94rMyL4pZ
zVHvbT+1l_F3|g~i+ig?;f(#G?GP+y(;b5ck6=WU`HY!Pwc~~~8uC<dh`VpC^&%m{I
zU9vhK305a5@F3}|PLfRJM`U%%c<knEN@2}AO3rwcllaj>Wn=td&GK#;k2e;HuKB~f
zZnQ+&PMPHZ>t*Vj!awWDwc*~!!OaVY2B#JlwhX!`lS$RkWOFjsEz1r}Dyzdzw<ZM+
ze5b|w)r$$ibdlU9oI1qI>y8inwAwSa^+bXuTQ~6J&MO8a4IezFH;a%r!66Yg3&Yu5
zNfg9TkVpY9XIEt*49s;<32)E{B}I|`N9)Y<c8!kh{$&$jK11*Q?Z4uelg&a5<4wVm
zTeNA^aZ21IBMkw_NIPJcYYa%Bsa|$VsFqf3^e{(#ypGufj*<lIxCq>~VR1~!7{a3r
zVw!|UZ!G#dgZRpb-&piF{g8x5Z!B_LNGc#nrt*!&Q+9_WI_ZtY=j~!<!ySrbc||dL
zeKGGoTP(^eirhMNIx!-A7W=%iSXke`KJ`2DfUAUz0y3-sty7{c1KxaPk-J#mnD;O!
zaZ9nVuKyKzo3wsxI*9J0+@1LLAx<laY&-%l@-(NTF_&v72CL)BU&syvI!o1Dr(WQr
z0@&#U+m@~o9NNT-?|E8)LrfJcB&AjRa>N2O39@ywzybi7HbRvRJiXz{^&<`K-W_h%
zj-(gV8BQvsgY?=WBI@f9K~N~yK0>Odiw5kRfwT=RvgVH`a8XE^#nbWCnVPdR7>Sfk
zLnK+W#9v-NR#n4|JnU4|4F5fSvcx^)+ctEvBp8@VI+nWg>y{!`iLP(c;F7+z=<hDH
zG&RU@(KnW1C5XQHjFUEee^ZgCr~bkXwY;cIIX~iZ;4uom17<O#nlk5v*=m*U>ZcRa
z)D@&J&i|9TidIMtH__y`;Q(|E0?3Y`u>f736}=NH@`+@+lV5s@O;@eg7Wl#3)F3*}
z;fJmdtTmgAB%|&x#x!*TP5}~;fwRkR=R3r40meUQG7P15IzwCmUQ!nehhWPB-)vvP
z8Tvj(!V%3{q@9%_4K>N%jt2k6ZI>15<vjK8+R$-lOs%|)FvO^t@&lz6M@po$%w__I
z{PTfc3GTLYeT-@lKRVa<rlR-K@YTk=*IhJ567lmUiJv#gdD$%%x}z9f+<$Y?CjWIU
zBf95^u<@YSLt0kQ<hY%-aYJM1X?$$&O(Issm~R&KXt6bcw-_R3my4TnR9C%cU&0g2
zk`Rk^9(5w<nn7nfSE~SG1kG?WpPqdQ=UV*#46LQCkUq5hFYY`cEYvB%HXnUQUN}DK
zRtejdN|!XJQ?~WT$&lbmvf)Pg)6pe5#X2}OWA`y?2h&|+cNAHulSuAP8z+d24B|${
z3;ASMgCSzL!=k|&3Uj-2Nm;WjG~@PMvb_%pu3W&jlUHp;8xh=h!UFg^++*OML2-+@
zI93bhvVj_K2Z08RqQ<Kk2l)XDOQ#>J81;B^|LEAhp}p!$r&%ejMDGzQl1z#Q1+ulA
zDQ$<z;aE4=?J-d{qFUV%F@#Df3|>A^HsyJQeGq5v(ZLb%fnMzPi=j*)m@`eXuHI4f
z+k0>>jD1IucZ1wQsyO94irg9CldP+E6i;)}#S~^;y`#AKBEPP3o8#{lqxYxlswT<r
z70c`F-pFouo8!CDgZu3YN~5XQFB~1ia_U~)prnhfw3^JQcNdAR++sr7u5x^jK%Hz_
zT-&hubt{$l?v_W&X22xz-_s6^^zW|<%%Asa119=VHUp-){`&&<Td_@j2zGaoqZqG-
z3ta@BdF9+BVwC*KHCub>%<OT(?e^AQ%BtyOkwc7#_Ze){@cNlAyOVWao>eg|ZhD&~
zVoZyy557a=F1;+wB5VPAcA&*1$c)`2=V7xMApr=_`LG0eu`~Q6RfC?8X%K!v044m3
zp6@%L;vvR8lB#tXJVRDeNp3Q|!|EK(VOK*_0;bo(QL`hY>g_T|kzDPEd7)73&dESI
zjDSkdf~Ku_J~&+-e#q-OF9Fec+m$HhWQs}Fbgt22IFP`>&oqEL{qDA)T1!WGrN&Mr
zDeMARsiPmCA+JwEL&D14#cvX8Zh7m##{#f`>v)16xRLC7Nt?qAot{L~C3-J@alP*D
zP}FS|M|Ip3j_^mS{4;0}BNZkX56cBeI8ngG!+PS@VZ3w*r;sfW&BKbAks`=WP4K(9
z7(%>z3ia_vc<f3q&V#XNVWKOBQ+=23AG+;X0)G}FoEuUk6dAuwufnCTx=H6m7qrIc
zuUO6DgUB_XR7&N`#g(v!kGBqu37V-7I!@*^$8Z$LH)!lUwbXRSl5NdFS&=&32~bQw
zGw;0_;k`~yC-@6p99xQt`_mg^Z16hVcz8}=M&}DOo`Y{0A@^8{u_r<Kbb5Ann`R2V
zl%A%aFbzC1H^X^2<4k)mH0*W^5&$%74ycjVh?~QTrRV)I*<T`f=TtZQkl;@aZ+Zu0
z=VUyJHoUy4Oq}eY9+)}2{n=Otkx|CzW6Vri2~oA7Q>>faIS!LO@HSB-CTT3<-&4rZ
zMs!?Qv@@Cz)2$xzD<T`yBr4V2nMx%u;N3-k!D+Yo74I%`!Ktsy%5!(|<nuz3mFMmv
z_ZaEPU=%JOf2v5#-f!nXDvZRW4V<3=@D;o<waBR@Sj7%a1ft5UlD&hA$p`H@>&eIL
zA;e54L)bt8gK5f82jO7gprM*R&mgxMKC=76_4ckma#VqFpoJV&pUP+<N7bi_{?;sd
z$D;D7B0)C3F0}Ym(ch22S7`C6BG(Um%h3W*_Z8W^`h2!|<s?mJWdDq}uH2*{!0qX6
zT*2A8{uB~EaR{jVs3}9qr$$!;5p{>deHjtuQ@gL|x2?L(r*>b_Z(EUsi1!u!wiQW;
zcwdois}~qQp%mR;<kixP%q)INucf*%l7|fl0X0SO-=Co-58M42ugk-BfAJ*eQtysR
zpmu+;-|hL51hxB%XP@V;Lg|*$^@U<|iMtBLc>$oHUya;IyY<cc0K&q~*(oW{imJEO
z*sV;{^+QWsi|J&OcF9p6Gu6U@lgyM;m}QZOcQaVIh0d-A!QM}YLt)}z7W%9(@h@b3
zR+#t~ioHRVRG9b|ikw_<^ir7k7m5RJf0jO4C%0{n|I&C`??`^77=68%@Be?{YP(-m
zYQWg=#PI%!k<tB=<D&=1b`3i-*6Yq8_RSwGajS-e=poMXHaXH|B7TSb;4FYI<YgMU
z!M9(y{bDR2|6ns@G46C)m8SR+gd>cKO_eUK+$`aP7^JJab$0Wi3${P|lApWm;!7^Q
zEL=9+ZEswDrC4@1l9QCD>8r(pd)mm-5Qz-;aDru^UVgR61KZ9!Vfy*k+G|M3CL^mM
z?e=T!HAw$`vEbhR5=g1AWVn|mEW=75YPFl%t^M3@6#aXdq!?6^VNmtp+&7B;ZA!iZ
z>l?*Wf@G4*{2Rq{x5V#>1PZxT`c5(WH-_ykyq{pZ(`|k$R&*JpqP{#2x{P2sBb!Uf
zo~38BJ=f|EFvbj8yMe~{z>z{zEtlp|+>8m_a_QLD``M&BvQC>UxB9`2s&zp6PdGMW
z$nXfVG=L|~9#U~0n?GEP%M-DOmcZ{6%P0B4=2<xoF%%1@dS8`$b&d>ogFWQ6EAAgC
za#y-z58gcDI6^kqq+LcBY%&<^2eqz-8l?ZZSU4+fLm<dFJ<G5XTp<=}Fvt(JV<oi7
z$gs*&<Dqt};GuuXm^N?s|Bw-wmJDkAOUAT$?Y8`DdkqP5GO`*)YW!<^4H)yg?LC)_
zB_r#(9uWC%d(V+E-)rxvBorB8Hs&K9w<m)oBlMi9@%{Fmi~Y&SdaegVzTe(+HbfsT
z7EVctskjC*+zX`|LA`_Vuv|xO@=^YgV&v{;?6$WONruU%tArmZ`peAt3am$p{xUO?
zjLRcMLgUTLts5ABRE&NStns`&=07U(oU3)lT`>4)v2cb%O=(7n40qvQw=!t%(c(H!
zL1h5q(c%f7AC*Cqj~2PlYCvW=85H<&vG6Q*YbOZbGSkQzTPzahJXaaop-|S2d}}{0
z`e*PAih<eaMV6}2&X0?1GCLx1;N_>q$VHrVBWWxdh{Q9`eDxQc@fBD<E%MN_TW53<
z<fp}L7ucp=x6XRpP<pyis#K?G>W8MgX!?edk5c6;P2W)RQK}?q`i2sldb=eXnKY$W
zl%n4(<@+zedFs|*1!%ET=RKNX5juvmAAh>6v=Aj2*4(`2_bW<_>V0~#0;rN1H<b!o
z`#+L1-=lxFEC^PVEWhK$9qRmcws^Qt1sNv8n^i1*r9wyK2-8x1$y6C?^Je9xn?nd=
zS%;_=$mrqSBeovz9ll~{*EP-^5Z-rlk&TWibYQ5{@gQ445M=5$bz_VfvyN%#6_lo1
zfoaHq);E<>=5#)zn@T5~>-mff=zUX(&^f)AB+5Xl*NQSnmJz0nCfw`Mz>aC#CUhh@
zXy%%A-(Ab>RMtRTtuSo=;~L<ehFVj>^-_xh^5S?}&XCu2ey?puUc>m>cI3tJuNCqy
z@yH`4ZWZ#pDuD_URCzIsZ;&l=Zp}A4u&qP<bPJxnJ0$HV;H<k$#RC4dv;dJ|v|C97
z?lP@tIKy3{`PNc8TXUvQ+*;b05nfKiTZKCZA{^z(cw?!srT;z4d9o8z4hQKrafpad
z+}-fAf+KMp;7O3vp1LV3a!`P`UHx&6lplizC<?63eC`!tEWF3(K3T4GAR~gV)O%z5
z0BQ|<W9bCHjKXZXh~bST4puvn#lfrFO8#x<?np<TNCvsl4Yb=zsmRi9_H8BqN;HLm
zbX#fbpalbTa{+7N&844RFaQ8S28aQfbs+QRk`GwtE6BXL<O9}8g3OysJ{UkpwQesx
zGr<7e3I@2n<U`O&fd@$!3_z0kaC?bhfKv%d=w{XY?Giyk>*X&(fJ`UXnd{UMUvY=O
zUGi~<-4=J)o&=I5FY}PzUg8AjRv_v4Fd|9Yp;9XC|H;N7T_;am({y7J%W4wda)C(Q
zT8`gd@}cjfmL+M%zAAcQUA6Q(r8V#I(F-E+@05sM(8-B)65#JFasScNIypgghLiek
zI7u>`?+j}aN!og6Sd&OHobN1gk&psS)=5IX>u1PY00bEz24p1n-W7O@uhyRDEs`Mf
zuE1M5e|P6I#9QmcTXzQDA_X2K9dD6jsO}VRX{dUtrT3NAe9{k<j;+0~#9dX_La!bT
z)gP94b!Uta4f$3jl3Z*(3t6}_1(zPHH<5dC<z}%Uwjry~GK?M<S0!(1oT^LGS7-qO
z(u5-*NvQINCBF?x5_JBs)a!1yB?$rlu*CB;{~)WmN5gqn2~W^xGf$9hC1tYyXY2^F
z^~J6k!fwVS3j+8Fjsml%oSp=JQhp!{<@Y)e-GoN;Gtfxt<Xst!#AJ7syc>wZ(CDs`
zcLR|`rN67>-9RL<3GOQ422$){4`SudBvu|P_OM5i<<Ej-Aw^T|N%+W;AD1=Uqn)CU
zl%mo8yQ2RyVh>%=-<U~cH#wFE{w)jhYm4%eLj{F$)i6IO$%sSBFyc~4K9Y^N`2Hg$
zALd74M*JhC%iKjwBpLCKlrG<Ic94?x`MLW{`u3>sN1wLzr8<~VKVT+3;iEzN@)gWJ
z8l*2tYs^dE9(C&OpP}>xpo18YDS*t~LHhC)WbO_tJ4ukaJ4oLiDEf(KNc#3j`hFrv
zUsB*f(n(*EOp{Lp>ARlS6-sNq;iaz*-hR4N*%beq<lB0Q-}@xrzO_ugIrrx?F6Er4
zetJG{ufVckJdw}aB)0V^cv|T=153}{z>;LN?hE`+5;ENvBpyiy_P!wTNW%a31&K!z
ziFcnQo|KREnmYGCZT6=+h*3WvruF{*!2WzS=-wbE31at4`FO7zP6qyqC8B2D#&CK!
zAz}l^wz=`-@k8ON$%k$GFSguf)CtFjI^Es)_*U_EKUH@((J3qZ-Rn&XfpF-oq|g_$
zQ4lG=Sn~dE3e(vymT;A5T_?#Xe6e(fi=-gQD15QB^`iJn8wJXKxx_U-JD$2{phJIH
zZ}JFG0Y}NBFPFO91z>yy$1j)8bpg>Ntz9Igw88a~M_>CH$|C?ehyfYNqpt;d#8;5{
zT98L1LFQ{g9_a-BKRiS7XuagoKLmM13Oq<Uc|;Pn{D&ZqdaI>xmDc>&%OjnI|5k}J
ztC~B#5=Y;D+Rh}ZLmlcn>X3vw-wtz!ByD{=EFC1F&bQ@E`n+Ngd&O)Im$(C_?ZjHR
z{pcB$gT9exS_t}Pkbv6}_RcZy?(h$n$tD*eE8JzwJY}uzd2hh6xsEdGw(tmgu|NdH
zS8!pK4lWVKI#<^@9volXoLyUJ%r=g&pKY~{HaH?FtsTXda1$R6WL~Nz4ruXMBRghx
z5-H&dD*n=JxEauGuTgQ%oEpT1fQQQ9r<lUOW$rQ`8}05E<g}<T+PS3L)q}8SXyFUS
zHt>bi+lPag;j4|jS8qwe7Y~>GO*bSFGY^;iO*bSFGY^-z=|&U0R|@GPKf?(QKu`r@
zKvf499tjhiub}!!nBXKq^^q{ab<4z~&(H+#)dYVuOmI@*LDEfdl91uiFu^xeOFu2G
zd0W|?E6^PeKP^>Gh(D`Ywm~!e)n#TG=W9nW+hp(g_?TyOlDRgX={e>@ZvM}kVvH+%
z%fLFmB?&XWy6mlNl5oMR%YKTHgl}J6_EU@`Q|#4cKgCEg#a>-ziajKyW`hnJ+)|GI
zTRGn@nmyC#zTs_d!+4uTwrxgIS*R0xiC0cc98mlX2cvke)(!r&PHQP<k4xYvI$!5b
zpnCHKuB`4GoVI)T(tt2`$VA?0A24^t@Pq<>4w-aQOL~<+cQhl%w5NUGVB2@F^UZ}q
zNKZQsqrC{(`oZIRV03)Ko8$Bta@|t)yO<<3YhG9OyO@@y02yxA%rcmPuPd{Qc^3X+
zWl-SOa$(cJMvHB;N54{BoLk*Wxnh0hXSWRC+*&^Ir1&`=4(ZpI3w;CUCRtxhVB4Vq
zJ56SHKD#mC@e+Bx1xXlC(>)7s83u|&#oAokz~|C$l%qG4ogzgV1|lOcko4Z)DEo~%
zz5?wx%BQ+JdP%}Szftyg^pb>u-cT;N8@x!uKyN5-ILnlZ4U*Bfm7neo71cqE`T;RX
z<lD-Ahl;Ntc3asi<Rn4twz5BVwn3>kmw$GiW&nZ=5Cbw&M&Dfao@Ty+%$v*J8%WZc
z_nv0my>ol{nejAl(DHD5*?XEvfd@&qJdk7rZZG2vyg83Muv#tMQC{<B<y`-x5wY<h
zDlm<Km$JZ1sNM<46tQ?;ZX5D9JEN6MHIDG`1aXrSZVN*PH5B*Gu^8r;uWR9Ciw#26
zh#Zs2<B#sjlcqzvJ9Zq<5%Kg^a!x9Rqv8j6eObzn-jdcLCC$Y`C+u|(A()l*H@Oj9
zJfY||X($pc?uHu|+G<F(9Yl9`zws=yMG7_RdL+Q%mx0}}!-Lqo#YrkQ{oEV9bfdl4
zuExUgiN@wFTb!$KUN;N6Sc!vdqOsA#DFJ#v>JYLR3pzB1tkKmox`F79GEXZ0l^kqU
zZF#?^9Q{7B_D>aVg2IMw7i3k(b1S}!=zR8~jtd%xX#Q}XtnyafjyEwRI*c>jSlkwF
zT<3Xs;8J&{HJM&gq6i`L_;S{-t#&&|0A<BD6F!9~_qHrtf>hT~b?|@={8>i(p>SP*
zI!u(-*8iOR$AQC*2748DoAfVlC4H#Y96VHeDS1N1vgX=~B){6$NluheeQ>j{vt>{v
zy%>j>5cfUhSQ3w5Hf{FvQgOL3U^3Fu%w{s&rkG_gN#9%cJA;-1i1(H^o|aW%PQSOz
zt5pFe1>RRKoS7Do93>-zDQ)+Cnv9anf+<=0zA_ibr5V6{Ul}igHrlGf^8Mw=J(EQW
zcqE;~A&JC!f4QsAjBt{`dVhJNi!mh$r1zIO?C=&X-Bk(4KPpG(_P^HcTDAp^6A{|Z
zo}Qby5?E(fn6BbtZ9v%~xu|p0On5deS%nC6!kxh;D<RN2R!vkMM_AmExItdWad(*O
z{SddtGI`t1^3@gKEe`_N(KXOZlMw2U%KjV&Uk!PGUm;1l_DAKj&+$Y;q<x_5qfDx{
zMvx4U<j43x21#W2K)LEdyeJH$50w4BW>u*_F8jy#NP!c{04WcoKQ8+-n|uY*AD1_r
z={q0+|How>-*W>;)juiw$49H?Dj*pkDL(d3GMwZp_!BXKBZXWAf0D5PW$!9;S*rV}
zAW@P5l7d9<%5YL#(Ou;YfnRj+`Yti3!wGiz)3Sd_uWF~JNd`!Y>HO0SC&e56X}RhG
z8Yv8<KP~f;-WRlN^i@kAEwA}dCD;EWB$Lj<4`WQ))YidaBJb@6oXyg~oQCJlZ@4?8
z!aWu(-o<I6vdP6|?`d!o<bu6xVoOQe*$_M1=asY&?_rxJn4#K@(y2t<u6L9e0NpF;
z$|Hc9h&4%0c&_Q*=^;v^elGi<{xK%*f3h3i0YP-Tp5(FM=IPp@87^hu)oYy`VLyi&
zOD*Y|T!f`FUAD)CjBHJD!m&Bipq-)Q@RE)cWDzL@%-fYsEH^HqMD$3tS!NATh(qD!
zax=cTJ`32q4oz5JW?s8BMDwfd<|3_bST>_Sn<v@!uqNv)gj<Gm8{J0<U^U&aPa6Nn
z%F!pvd1FA*eEwLuywQXnNr|YBmwkYpr71v$i#xLn=I6)DKJH8z6u2A3)MTEeU4|2r
zmO+iX%j<j7Hb~#oUPB<r$ZANjyr;be{Q6hu+-Vz{tz<auT5Tw*@2{j?O9k$u7o|^@
zqx-p`Uh|AJ^Nb8PJ4iBjK3VpU4w3}gC(9?hYpqDq+9%6|h^%*Yd3*Dd<*oNaGp!7K
zuW*s%r^-G$P3b<U_UV*r$^hcM<-)V#USH$HYUzKL3!f<$T^A^_kvjL43&U9kb^fL!
zgFbz>T-fFMgjgwkz8w8sI&_kvpD&l!d$JN!R4x2%Hc~F=hzu8&*ry|I0Q}pskJnWO
z5WZ0M=fy1TGTixN%b>;=%KrSZGDv^1Tv+c1!o}B+;fxb2U?n(g?gj#+zf_LCnGS>&
z1~S4x$QJohSo8X9Vfd2PWH)MB7``Nd=LP~>1YiT-Oa~&Tf%tMZ5IGx&uZZqifPrTN
z@zrb~auo*RYvsb%(}Bp@K>UNq9O~#A#BY=fL!R!0cmHEKdLX5{sP>QL@~NKg7AO5r
z<-%r96VenQ!zm7Z3Z#Z6|D?sl_=gM%d^@8eX_pbGNCq{&T{bGhaf*v3_%@p|E>4<^
zFlETF5;n;+0YLh}a`bO0-DPT#5$G;c>%p>rvX#=b|6uuyOFiASa6VYR{JEa)YzF}B
zdH<HuJrdpjIiq`IbblzD0Av91UoyH!qWiy=3*SrW9vR)gpYb~x)Ok4LcjB`jDMvp^
z>8?5dNV$B1r=kTQ|FB$0Jl$OYG8rzOwa*72|FBHRfup+xApa<%y9+=jBhcLiApa<%
zdtOw1G@Bu$L4u4hL&&faK7NNrq4ST`gl`goOPYZ+=Hj!MqcZ~lmf<E0z5Z!AdQ~Mz
zE&(JX44ll;pO$?zR-b7tKP~%cERqb|Ps==+?j}s0f%|EB@Ku!{x$+vg|58aM7Z00(
z-^(jO-tz{J2JVJRD!K9+xL>OjUQr2>D{lk$>lNmQn=oWh=arRIP!+1BS68C{N~<=F
z3sQ()UGWDC`U(XJs+&_Jl%@a~E_BxlK$Dv*>_<5&+R=p9R8sj*ni^yT`A-HlUQ;po
zuL;A9Aw-em0iNz|&XM8H###X@!P!_xcaXlN68&aMcWnoe5$LY%pj#^bXhENC2i;OR
z#hrp73Egk0@Z`3myIyO)rE=kKrgSfe?ypO`%=JB@`>h$>$)HEC&*;u&qt()Xs}$al
z(w!S*sPo23VXwm&t+Vu7mFTT0nWZiMR;8>Ci3CNF`Ar#BNmGCf=i0IYkl;-fAE2)c
z3cR`E9ZQyW8Scdz%b>=aE4)|}+93UwN;>6=Hb2O4A>^u|fp|-W5OPOmkiNYV{a#9D
zDZpd|GVA7{+biA$)Mqyj-CjA-sjVa-^X(PXR!3$|NdfGf-%H6{6q(<ak-2DO{_Tzo
zdh~XY+3_wV!0#Oy-HW38|5GXaZc6u}(fys3!f0AY{C-EJu+!}PJ_2#xU5VUve|-wN
zd3U9&$FaTz-LxlZ%qR1OK4@`gCHf$=kV4-lPtTo|b?%@QDH<W^JUt|-dS~T?ljAe-
zEl{=a=ar~`;6ytDmTnvIhOKTLa4~;<Vu(M_0BX*V3;;D_{#*cec!2+-67>yib6ZP`
ziwmtC7hG@z^?Qk%hZ=Jia94@BXxxL0dWlmSrb8S^|D&?bU2)iFT-2TnU+;{tH8!Gu
zR@QtKTjQ;AQF)IM7nIqh2;mh}ZHl4q2Ny1ZYtC(9Z%d_@BAGEjgkx}Y;TS<*&khRP
z9WGuQRtQ|`-_UM7=ZG;g!tqH|_f}nJcY-})E~=$PLYUnRc3HY@f8TkV075tLjp!B<
z9Sa9ktvQAD61p+PwGxaBe%-|>y`C1robin`6o2PDR4(>>u1-X!_SfV?5~F>rQt6L>
zUp}Ob@*#bq65U_P_rFcl)1`veNm&&f5t`>tvH;tmS(7i|S9l$bqemj5_la9n-^?QC
z8bgL1D6%uvA-dkY(9p-9uLDOjQ`}uVwd4pVNz=ygqje0IKkxTg{bqZBmjZxDIY!!B
zM;JxnXsaI<Gxspd{7EUj3(Xh&7;=emUc4rI&9*=dpxlrid+&&VVo>lC6^?*NV3Cwi
z{A3UamPP=P;S?#$Km>iV;$!zM0}!9A_=6>uff)LvR;T?QCI#-T6fWw2ez=m!7&h=J
zq@kal+x!6nTrKK{ixP3i89-SwNexIz24IGh)Z}|B>zw4a64vCVtyvXty0>z{h4BH8
z6SM9!mBRV`KmYhRoogh0Qdmia1Z0Mll*rGtW2N=uGnGx}q*zIj{7i+XC8Y>}H=^=y
zv?%+*kg)ulidT;GS)<jNK{qTT)UX09+MZMv$ow~z_6(~*hHsMNIG>f~-~s4)n$HSn
zNv@6JhR;=^i(Fx|5=pwnh>!H|bCoXV5+X_4pR1g;H58_ApA*GzkV9^x`u@cV4!K2h
zQRoqaxuv;qRuf(iM;o}{#-HcMudKUdj0tqu!R`Xk^JKbsBE3W?Ob=JgF8IX5V%tOM
z<P8{$aX=zX(t$5lx}0DJLqoC8`JPD9f&W$AyFk}@W%qr!_XB}@Kky-bA|VnK$xBcq
zK?(p#@F_?n1p*)m3Ir$s6vfel0zr_3NCFVRm!_IF^BzSbkCPcEaq46y)3}c$lVs8v
z+jZU5I!^0HyPAx<n%H^Rv)qhk+@x;D@wD!$*J^+NefIa=?*gO%*~x06r6u9q@0|ZR
zXP<rc+2@>n_Wq|Oj@>>NIsoCms}4K}9net<9jFy5%WHhrb`GcgX$P~|>}_>AWNpW|
zV9MS#Eb4^#jE1D05SM+o+6mG5yQQoX;;`?k6aTot>ardSm{Q&EmJ2O!a)vd5KT;3u
zKK0NyOqnCDdE!4SI185-L7)cz(wxzp;-~7Jz<CSYps~tU8P09q_}6o86Ydc({_xh=
zp_>{W)`InP{0AlMc|Nrkep@fr{YtsGt>s@m#!4_a<319yLtHIKvs077fkrJNUvfwG
zFyWLID|10GKRct)lq`peXq?4QV~ot1f>uMggTc%b)RGEdtp${#L3(rYrNlsAKi9Y3
zm#dQxFdk{=!Xh8Mz-ehu^tCXvit@fj&uF+T(o$$jjz^N_`7<}h7^)Z-VV|fm%RCRK
zS6++!$&0Kk8mztCDr9bi@eVvVX|C__XQI{UO|3Cn%EFRU?YH?g4);b6hk9LZhWY39
z@Q41Ve_wxHRx{)FsZzNzVSn&`ta7bVxqf3RmRXPW#40syK#jcR;~CsD6NhD*f(j7m
zK<WRgH#n;1mGSne-TbeDo2-59l`j5UdCjtp(WU!%8D88mB#jlkvY=o)9`z}!g15#w
zm#ws=z1I~FMJC#>E-G>;En@czZGqyRf3p4BqWt^Q{B{@C#?W}?>+LrdWj>H)4&ln%
z_LDihlNXsfm<B1?On2eNP&XZ7WylmRD#Ng%`ApurhO4noF3Kd4lxdoqPSH4HdLA}T
z5@!k(n3a0!j{J=U*7sLy65e*4tLr$^uH0Xp>7fFXv6fDvQA?2d=zw~@MsxIDkD&;D
z<-<)L;HOZ9GA3uhbsM7tb&vMWEi2u-S!tWaN7>XBKwUEvzhwSqG96c%ozGcL<|TWD
z6ebP#xE3@zBNwc}RgUqOQOzWPII=avn{UmiD4;+{5l1GhwAQEvXLMA~;htqmYH$j#
zXMFNstoKS_nooY!l@c^KR%3w(p49?%a`dAsTn7+NS`P{lHuGGBVt;QHPt3_<Th@Jx
zr5?N>;|y|Uo@a!(3BPi0YKHTEC$3$FW_`Qb>U15KYvD>qhuX+C!r$em$igvN_%PV*
zNY)#>>cBn4IMFK6vcu|O>)k_oUCXLi{n_-UU*bfMVh)eoz2aO2w~8%c2hSULCA4T<
z8xC_S;A3@la<bL7OE6FxV5EkC>1}?{(S>ql@;a`0#72H86GpvC8QpWx%o{Yq?)qWr
zD!3MQO%Wl9AjYM}2xo)BZocf``jj1VJ<fM?o;{R@C0USD$eD?P?vbd6*0W!rRos4K
zT)^T(P=`g6sM2~JtIOHeFd5`tklu1_MJba|T5Yt1;JBq`X66{qnABs9XI(I$>VhfK
zAwtyq3^stO0)C!Slwr)3rWr(6grsuc8lN>n^(w$bU>eq_@a8HrFsN3V-nFt(yn^ba
zYbA9)ecr6j@we<anU&1vluDxAG>U%k{;k*=*i$iSENANEBBi<1P#pUjrDUc`FJ%sD
zn-x|MyA$)>6*>s28cIk|)kvbMeWmO-*d)<dzEWNnoT`vSRr^ZW4)xGqw3q#fa`6Y{
za7sv;+&@v~O8-wcvV|cn4d)wWUKRh}4V8iPZdy_Tb;aa#%C3*n(M$r;cH?w8@k#rr
zWy4G>Twn)23L_TGXtgcPgqp2_Z)-Py8*VWvsa<#2^UlpMYaiAEX9$x>5^XjtcBJ8A
zIkl^S1!_b;lSvc)&JEK!Y%xDzi}{gu?1*2}jiyX+;W*161*p^Y9`g&`c7UaG?_MbZ
z2Q-ZOr_(yuc7!kf4;j!8j$|3M0=HE^8^ZoLTk$yK80R(V!+Kg%IbuHDuRA3VS}U^^
zc%d?#Z#jC|L3ws#(k#dp+P@gQs}}r}X7YlfKD|Ro2thwAQ>Q5)i`u^5;8VpX)gUde
zg~JeiQrQq<@ECXKY=rSa9Hbm)64_g#;z$+z!l1?ali<Kh_E6k;(rV5RzD7P{jVcdV
zHMOc;b+K%-(;<_}sf@>fDwszGtu7T?7IrVVES)FBD%RdJ(^9Xr&$hY9OlLBN&A<J?
z5#%?@9QtKBn7`jBKOW8~EC=)b8)Z(HvmDqGexv;4(_D&{0;oKae51U1PyFjepYwox
zOLP7gIo}G=B{V3k+!J>YcyiyzB0)SVHf)tt-RfpwP}|rA$oWI~n-1K)J<YikD}#Ng
z>aSR<LXo-qQ?N6y@rk0wmP58!R8$4Rs8vM+4pVf@Ox1M2=q{8I&{8d3mkYu}2Y#tj
z<O!Vg<o)!~xWL*0GPBngB=$Em9l=Ca3P|Qgk+@P}+kD?c7U4!U)?)%(F-zC*le4Q+
z^N1PqC~IwEqROReN_U+KK-B8k$!_Ue`LWZ<z_;>ar?Y`?<;PBTpx?@mT|r~_Esfnz
zuk^9whwqhfr0|uMVs7KrQQKH+eUldvxHf0QrWH|-)$`hkX)+oYh+-N!ndAbRb>55+
zwbFX0HI>uTg&GWBAwmI>N-jRe@7#f4j5KM@hx`i9YS4oUZ!0g8Lu{nwdSSgNpE{wL
zoZwg(RaV*9%9@1=z9EdKv}MJfD&Ja4h1EFAkMhLAEsuV(u!HF`Ch|(PJYl4wgU!qM
zW43l*&KhKDrF?H{4IIab^6U*eZp<>+vLAXcdlh&R*N8HFk$y=Jrg1cAgxGDAaJQ7{
zY{JY-oRwiSg{r27I$*s$i|5P*osmVD*Pr5~8bd1h-L<3oHf+I$8HBWmHZlydmSJ=o
z3-~Hmn>GR{;&V5(+y#@)y?fovNPA0I!nOgf_l5mYN{9B8hT;b<MwqtZDJaes3`6m`
zsd>C$8Z{Y?3~sT+l)$vvW{eSxo}jVDRoiL&#UdVtChr?fjC1XTFQ+xJQ<=SM-cS1<
zn8MC}RSR#nupmo#7nGh%*xK9c-On>F8K~-!pJgif5LkX@VI?3^%{M;{!5ov12P|3=
zD#62QB}-as4=jY}3{xcEGRyNJO~ZK8F+9^Fk<y$QZLZGX5muWy9owKDI6$9IjEqkt
zdr?-er?$&5lNjD7k`|3SbNFqM1W8%Mp%4i|Ps=lBg07>k22pecBe$D@>C@RD9Cjc<
z5ws!E#zO3EiAOiDI<+cYA$!(U9~0{ZojnvrWl!ZKYQ)X7)tM+$O_e<oXx?qkvP@`X
z>}}f=vZPGz%0_2}7qx2UqmaRLaKsC{`LsaR(7><ZBMl{zy>~n8KNK6x#cfJzdYUdr
zI^SiTs4hpc>HJ>VO>?C==#2M!<#oYdjs3uK^u026ojS$W52QaR*YC+NWhKE6RZLlT
zevrqM^~eY1b-Fta8jWlvJ}Be9HpK+u`{nwsEQ2fn_@Rm^JJ0XuF=g2B{qj1QTLetm
z0eru_Z@)tI73;Z4{=IVDm*Rq6*95KfitB}(e%o=z{Eewu`0dX9NiG7iGi3&p4WVR}
z_Wlb_sU=9!_*t?}bN<As$mG>*eNB%)wJ#=6;>46KF}6gR`)bMQtQG`&_1L@m@WfA*
zf`-YtRoISZQDV|UxfA5{wz3&={9d`VF@C@Sb+fi_KP(e!`prtuH2*Rg!wHTrK`2|=
z@!R2tR8meWv}R<@3q*jsk+iPqneHl*cqYxkTsz<~UHVWnBS+O)l5Ob^%WhP_SDN|5
za&vg>Op-DCVR`#g@ByvXw)FSQ#UG2qwv;rvf4>~Bi@zj)QKZ$cA4x_15AwTGtp(X`
zGAs=X#;vBMVP9oRqxlp;cyT#w%Q8TzHd?Dabq@NWaHk!fg$ZR1qPw&xFsl6kqy8w>
z@9YOU@uO6~vmfa6k5c{4en7wbQL5jCA5iChB>isK`whk)mg}EtIkB+c;>Y>7SyFE!
z+vF=es8|p0zY79YA-xpDYP+SE{$V=7EQi&(F1UNNA87X<mT~tew`ux;M*dN`elu><
zaz_Lj4AbPrAT!sl=^zc(vIsS)UQ)|v+FEf;VAC=%yfCuM6ts*hZ=yEk8ZRkE&DF+B
ziv3ZZ=#pZ8RDL`dty)`Y{2!Gu;r}NoEAhi8<N8f4zs8fz>IsMOlHY4Dr}5Ty9Sa~+
zKCJQD!`P<ANm4c4mt2@dDH0iU-p?fnXp{G}>o5n@Z3ND-PZnP#-9p-&J!X&{NHI<k
z(=DUAE1691suYq;{$%W1M#}+(J{dnAjD_q6BM8PqZ-(KuXh?DW7vmKzFIPsYn+G*z
z(co~d=>Ba@=YHgTjB93MHjP50rMSE{KE?Kw)&yhd&&LgGaDoWw&;?AV$Z82TDqbg_
zbOf$<PCA@ZK&G{EImMx)0M+~i=YBrs?)$l{HZr{%H>_^i69y^-zfqlb5KQO*x*fKy
zx9^&(iJCgJhog8oSFKEZ-i@)=I-1qNFYm>;-`FXk>>-K5&}PzWp0N+_rfTrT&J=CR
z;cNE27Zd4JOQ^<=5r02+!&gg(AF3=MGrITVRly|La)A1N%p*T7q4onT@P5pTnV+19
z*Il2vK4WGvd-Yck^+`GVwZ$Td+?vd6lJ<rHn7uPI7czGb#g97#F?a6XzRdoU_%X?o
zor*!iC>c7|Or3i2FdSZTZTRLtk1B<>(#Tpbs&D75VE0J8z6LL-Y?E_KApW<Gm^Ma;
zqjn$3Yq{Qdm9=e|SpS`4tyG~5<aE5oKqfeJpSi6wrX`y6%LY>(S*>EdS*h;sxTIgS
zL0$skSG*xv{_dCJbt-F*kuK+2vhAVdeo0|wQ<{J0)Ai82Jo0!3kZV(J6mfUQ-fjLe
zcMuP0o(^JD#Gm|^wWD}Cl<c{6tNTLyM9nA$u2=@<Uvx}3(>SM}-UiMP?0Ipl{eC$e
z%Vl8xhmM(e*>p&Scs5?kJ;4=D^Dj@nMKro)!2OiNt?`2WDkrRG;*w%qECb>%IYguK
zt7uQW@;aAkx<6k=@xScFo6<54F*`GB<`~O>_-YD~mT`!WK-RCN5NR1foQRvG2(#WT
zqY;0_5n?YQfM?_KatGq4y?DtAs4#Oh6;NDdE~5qiu|urR74vS$)Ds<M86f{j+6^xv
z00#65y8VsiA^fL~(3F-D1X7Em87>8R@Vksw{AZ4_GAra1xjUWxvJ9BNmQo~FOh8OM
zG(Ohd%O3^puRB^2%AQO6BSc1eUJoOe(Wt-SFeNLX!k6NWsU(m*`zYez8xGc-6EO=!
z!bgStn+|C!L>>#O;gudw3m=JUe=DV0C|g6dvAEe0a|5&t68>$+^!8k+GKI+bO5Bo>
zGriQFr_Hm=K>ns9rxL$E12{K6EAW@&4Jr8D>Ffpk)n!2c9fwYb>O!u#kO$(&GF{~|
zrop^gTw=}o&mD11R&KzGb@#`sZDCn1OMc6NR#i)>MaVx+WMoaSjP8BgF=8(w00f7w
zxTPH|1L0>Jp(!on5MtnELi}tBk(Lp}i`9je_*qj(csp8Hg1A5DP^l6&k}E3N?58Kv
zotDwJ|H9E$=ZdLqISo;RHKF7CWx)OXg2s)eWrdm3f9_5bBYtu@-1%QRVyeYn2qlGg
zHip51qT>2gvUQP)c8*vgge*(dsZahvP^VUVNmr-32gT&IO3%_@pLVdc8L3d}J{7O3
zQFxYy`iw)Z%<DVdhvIrEFH0BytQWWJ-N)ims<bR!^mAS`E2845!m@Pn&!@%HA}S6m
zqhzt4SaLl6oA;zJmqxN8tXPe%sVrUkU9UVX(S0OdVS38aMc?<LAwPORQ%*Zsy7-TI
z@q8&Y-L;dY0lt(r-AjmUsbaEp=^yvfSrKGnInx=IF8^n|e6@@ykX!7QhWN871#+b{
zjTR~}OCx>Rk=88GUo@JwQY;Pe6^97<)r^H2!O|FiK5fPVg#fKAS*#5#jrSKEZ*3@?
zQwF*(#_3{P^=@LCz|yEc>8R-*tws^(9;+@Xc`aaR*uUto>8g@f0$48N>H@qp)=xQB
zu8^jNufI!||4UvzEupEAF1<^a{>xrED<aO$t!_&r{1r#YmtyfsSD?$;g19u)*BvTd
zT(b2rzj*m#xHQ^-<Y?*Q<!d3tEluO0K^uo;^P&~dEQQkb?|1*7u>NHQSYuX9-o7$<
zb*Ym7tCtM9kvDNT8qvrsRrX(4+44xPNEN_Nd6sDQzpMpN5l#Xc-<((2wChV%|G#<Z
zG`|QYyFrT1FID#UylhrLg(o;$UQWON_q1?YK#kVlXg^C;{C}j4_WaC(vi`JVsig}4
z&<j^fsOI@QSLN<|slvZ+g-au8e&&A@MRBAP^wTBA>R);Bd>M`Q{hN0zjx=h)5(t0b
z2)QCm;+5)sYKXBE#E+Z+HHA)|i62J_Eu0}I<I^*zXU^+Y%>2i8<X($T%*<nby*Jy%
zRR22ri$~(dWW|$pKVB%r|8E=@RwmJtbxGGB#F?Mb)XAtUF7b^TOl(e%Uqw~r$tgAp
zvu_j5=Ej{$+r(}{;_b&elH+-DlDEg=++qQanp?44I?k4dR(n)+gNLoP?^+kOlnO?8
zswF)Pn;BW0>mF97kK7>ng{giCar(?CG_?YvwYqA>+Jh&lGu)W^b5^WvxjU!^LuW-W
z8<%kBq`Qpp3{<yOT#kBlBNZ|Sh{0AwSN*jOGpiqOkzE+ymc6y+rW@-9i$uKe1ag^c
zo~a457Uxpo7Jbx3PQFI^Rofg0fi)qVA1q5A)(Bm!S<FJC1*Z7c2>K|WY6fTR&;z4%
z+_(z<W49x9v$o(35ks;U`UmqAu2M1YA^KxxP84{EzVYHUH?~}GRL0H>j8;a6PmNvd
z8R@U^_xX|Gmw2_*S2=l!kNuV2;q#Y922P(DtDG4g?CT#Ht@I4_@$1mo$iT@9W5Xk(
z_$uoerD&^t=^46I>3{kBNdM?)Wq71AaPIuz0BFFE^bilSf3&?aFw{GEp>JU5bbAGa
z%Fyr_50M7W4UCa*Y#4T?+QsE6!>20e`bT=t0Mm1FU~pjUl2v$WU~EX0of;mICENL)
zk+Ff^3xho)c+4EZ`(=McJ?k47?H%kHIM?4tOu`}Rtn|M`e9Fq`nV!MH+KytPb#aKG
z^t3+T&C1DsTG?}QuwPYC^(8<@`g_OJq3U0~5RV29VmUT?zQ1>Xzo17yWat^W)b608
z{V!fnbW9@7_w}6XIo&^6X<Lda3{3BZk^XaPHKZ85aB_5PVC=$Jf93S>aGw!-w14EK
zf!_YnXDfrlBLAt%h0%T*($_QAV^xCzx%f^8PF@%tFv1NCjrEU=TsW`bV7nRRi%^EH
z_fWRaC_Fr*-ilZHhes|6R&=ltXs=v6)6ee=^iZHyj|egfbM%hovr!?u!a!I1SsCg-
zJveZ>f2g-#?HLx##evcO-3-_OZ96SYk@;c|mBJ`gEY_f143YlMu`WbrJSzjIDm{HK
z0n(S|h66?ioLwk1dZG7>(;W6M#at3bo9mLe92YTuh_=@4(T}Ah+E&-D9|<F9e}*4h
z>z=kB`K~|1kK5~>vmcw1DEuimp*!lHF6h@rKzEk9;y8{PabghdXlxCC<1ue%>9O$l
z3jSWZKKxC6JDYchza#!`-)}JdysLE3epZuH7>o$`J-}c;5bbgpu0x|;%}<B?!0hTg
zU@#PIE4ACtTwi7|TwU^efZ--TYI7KFJ)^ef?IAxfZ9A?11c;4xm-gAuQ4WSXZ+;Ij
zTz5yi*FF*Q0JD3;uJE_YVu2;vkbO@n{7jU|tTmV(@q2*5>L}Xdt-;_Z+QVh3Xo;;+
zv}fB+U_|YXy1jwg<nAmTvK&OAj5-<vI(|0zJs{#`F6#7#;UgmI<Q=&Xajy||?mg&;
z`|B<R#D*m5^6?`|WwhVNPktA>91(AGQJ1$7S94L9j~{;KqAnl5#w0pWI&2jYx-x?i
z2@W_6L3yJC4nw@l=s<Hv$PdhceTR%<Fy6t^0s9#X<P3&a<@_G{R|4js!-#tiHtz}f
zfjLOnUJ<^WM2CF*2y&Uhlz}<qFlAs4ISk>mqC?Grl!UU34*B@SNp#r9FV4Xb^^xC0
zYhqvyI}Gt2qr*Oa1bd7Q+xQh5nK(yEfmfSyFhp?V_W;ub%n^qnc4Ks;IZPu0H%3Q@
zzpPH7N*#5Wl{pv!y77B}Au3vQ)L{ta79DjM;<!ae9cEP$J>xK|axjEq<M#kV0IcX4
zhao~(^o+w0fh~H*VOA$mcPUVQbq;1VFx?JAB$ue$VTfK8b>r$qoVXg8ZUU&QQ)`mw
zxl)_`ye0>;2AJm@h5!uFa}Glomgu?Wtsy@!&$aF{n8%XnSP6j#`eQkm$ACHJFt~Y-
zjyVj`6QX0yJ3@Y7j<t0d%-SS6?wwkjgINpAafiVjaCF>Z@X;O}_fD+^=D2q%Num=@
z;v@%?0CU1&5@1d^48CNe6Hej;m=jLo$CK!J7iN#=U>*nNd56JOO!U0N;A1Fy-i6uY
zz&!85Y+VxdIBnMDVAcWC<1p)h>2Vmml0-dDn{~kSIBnJ^(Mg}0>vJ&cfjQ|g>w!7x
zFg$3FPWseb56nrQn$1bn=L6oHgJ}k)&taN@>2nyY4x>IF@Md88e88VbqEn@#Hh@p$
zV4eWxl*2p$%qfR?0+>_HdqaL;PIVoz0pE~Br(IBN$iZv?=Cs3X0OqvAYyjr83yKZE
zoOVI6F^LA8HXCy=8-W>cn2o>;ILt<12Ann<ff;bxv?S44m+mb&m=<8pI!p^NXC0;m
zn6u46y0-vx)}(u}aZ?fvmY%V`Zpy)I0%p)*HUTr}Fq?oGY~C0012cHwsL|%hBsy0*
zVn08bgLx8|a}M()Fy|cRNnp-3hdKBpFz5CkHki#xG*k+d-<*Tl49t+jYzAh?VKxIZ
z)V$NG-3-hSMrRTfTaswF6c&svIhZZL3_HvgV1^xL3oygYPZ`V>V1{>@y3@EdiO%~B
z-<pHj3e0(j*$T{ghuI3ud7t51fjRFpyplvO)`tb7l7p!L^CC8Jl0y|>Uc?`h{SC~E
z_>8r`fqBtahHXhS;xOBCFx!9`ahPquj5y3TU`8Bf8!#gd)0#wM&VH>qm{wrMyi={f
zjCrS8ff;l5YXxS^*>8IiU2s9MJqNQLm<tZG9heIavmKZVE-1DGbHN40Q%Q8uRk^2f
zFi!z<(P5qf=Ay$q1<XZP<(>lOqN{Q{lIUeuOm^g8b^!CT!|VX&Wrx`T%*(Er>;UFv
zQ%s~hy;Aq@2UTZh620pE+X><;jbQ=U3F51cxD&)z9dRd!uX_J>g7~WUZ&wn%<_x_n
z2eS*9*BoXSFt0hxE?{1BhTa9tYtGPZN%Xo)_qH5N8!)dsOdBw-J4_oeue)?_1Lk#?
z?z@xdaw%xAyK^wRfw}B3yMejvFuQ@d+}vWExEq+un_F#q?Mb3HT-Di=gV_Vj8xFGv
zm^U0|4=``Is<Q`}H=GlnPNH##c{&I4G%({1^E5Ey4)ZiH;|}vQFyju>o<vt1racGK
z4$KvYX$R(t!?Xi)#bMfkx#BP#Ni<OkqNF1S(*ewc!*l>M;V>P*Of+vc+H?RjQQ2X%
z=}e-@QV=DbIhamhCLN{|m`R7}1ZJ{%lfiTXGr48E!R$?<Yc6{B=3w>$bIoD)0&~q_
z_5yRwMbBPfuDR&hmqgdSQ~Po-`+&LbF#CYH?lAj+x$d3X2h4Tv)cz#8;UwOlgV_(v
z4Tsqe%ngUx56lfG@qS=#IElNGXv&xKt{hAkFjEfG1<aJgbOAHv%Xt?tQ@)%ZNTN5L
zHV1Mr2Y`9gVGaQEro$Wn=1r%~0bt&A+8j)xn?5xU=3ov2bJJlC0&~-04gz!2r{+Om
zZu-<bltj0Ezz^kM4gqu9VGaRv+hGm?bK3{}5HPoWzz-+UjJM`+4(2d0GY)eYm>GvT
z49twT<}fhwmZFvKND|GK_8U7L$-x`}X4YYj05j__M}V1a4l4B#U}gyjBbcK}H0R32
z(HzWCVCEd=C@^yla}=04S1yhMGv~_1Gf6b>Yt1t`m}h{QcbI2@nRl3HfSLET<{4n-
zeXZ$EqPwNt)~W6sOgAuh9i|(YyAIP0%v~OJXaVg8=I-`3>(sMJbk8TlvpJY&fw|`}
z&jNGLVV(u%o==8nfw||C;khJw;FICG9L#gTJaCxjfO+6B&jItmC&P2VJn+eIEQvnu
zTzo7Ca}1b|JIpa)KJGBbfcdy{@iAaN?p%C4iQaLg^mq>DI56)x%yD4eahT)4yyHsg
zabVtYrSwD+eZrT!6FHa@z<k1CP5|=>hdBYvCw#d(0n8^@?wWM^(D0`UcAOu>M9(Mn
zpDaKr+!r=JkA3)`Dl~2n2|WiW0Bc|L6rcdEC9nbiWC3bfLQen+kV{}aN&Tk^%rkxH
z$%FL(#+Lxr1K6ihupYoZRbZ}J8NfbOV6qA9WK#d>0-G*<IGG1K2^e1j*h#=XUEp-Y
zvH|w#!iLt60PNERc3uMOP3k|Bg7xOXdI9500P6+pGbvavV4q3BdI9@P3f7m@f3|>(
zRF!>sus*=}62STZ`)mr<2iRu|8@7frfPJ=rpj6BHllspUm^cFK&x7>?#+Lxr57_5Y
zuztWkSJ+SqWdQqJf!QOlQ%U{jQ?OHcuv38XC4ij*?DHwuDZoCTf}H~F^C{Trr2Y$O
zH&5rmP6Ni50CpO%FQj0n0sBJQ&C`H=A?@awr2gFkQ%T)ClLtEk7+(U|8Nl96!Oj5o
zZehc=PzJDf3(O~Vb0DdIuYi;g*gzg^05HA;umQl{OZjX7u=ff`3M&KHdj&*=z|P`{
zIBnV4JlI*l_!7X*0`|oe>?~kkEHKdpb{4QNrY(CRseeBmfEV&$F961u0QLf4@26ld
z0QP<XQ7Et%0DC_jfWf5xO9i$_`Y@OW8w89m0c;SkFQqga1nf(N4Pgon0`{c>`=o#I
zTKuG6oJ~#4cOBS!Z~tCyd}glAhX)nOn((#LzINW*-}>c3yt@AZS1)=|$c5p|wdAol
z;xczb0V}4JBl<I07q758+6_hfEhLhs<9Z(PUfZDS_ol8V@J6e<#SFTWSFhKGXGbhk
z(jM3A4cdnKN<`)ji!u-J{C!Tjm8<p76ymi*Gt)~p?0}kZ?T)ppscY*Z)LH;F<=UMD
z^8mYm^oB24D&%hcaxq@h%j55<J90n}NG0Pe5zmOVbOX-RjfDKk^Vm0F>~3X6)TXZ1
zMU7uX0E%a&k^}LID{@=wz1Xy<_(^@WW~y4to1DhP0W(uBUh#RxSg7J1i%QZ<&r*Yt
zD|)gqUSWLI`iDH33j-~Fz$eHJqs8in@WUBCYJ`<3IT|-nhyJ`QW)lrQqzra9miGmi
z@wph=*-$btrTFhd%C7X>FX>fFvOjLPWpCxI_p7@$F6#ZDeWszFF=>t)fZ%n~h85Jb
za>P@u*WyO!+K<-tDqfgQj;DI&iQ-8;>JjyXRO`>M2exq>#TRqJHGpQ_WjSVcwtM8%
zD=DXy;!FuwVi?U^vA}UHi@I*zQT~y#<+h@mWQO+uhZnO<U$tz-NQoc%luq<<YT7@F
zpY(BR+CH}akcMZF2}>eQmTz6XY(9Z$dPL^fej1kB;e_p5$RKMZ<A@a_W&1@oM#-Ld
zt*Qz`aoGnkv}X+;&f5@$!Lz)yxi)WT-Wu9olb3dx?~Kb<m5*_3KlQ4;+2A(Ny$|6t
z<LlPmIId0_L`@^ILJmx<zfE0_n5O+?dV3_z+xp`LN3q|N|No>+b)NsZLcH!_av?df
zu!~E|liJQE$KqAD@bY<g_OkKZJR|?%OT@~M-8gH$l`!B78y2Y6Q!ATyFXHxUcWRf3
zs+2yvNJ_VV2+D`b>nbHbU5Gb4s_K6;Yj2WUdsp}h`?m`5rfMq|HT@wCAzXECtzAAj
zebqftyXt;~@?rhmGZ{C86(nhj8;6E3pXnJr^BDKzaRZhTU55^HGZg+lw7-j+B>sM(
zzqhyNg~y^~Ra_n!INyJ+Z~x(aTr5%k<iJ?(@W2o^ORM9U@|3wOjD|gby%3kuB|rtK
z36qgi120n-$(MRYNDq$<Qyn-;jtriszBO?Znfm(<bX`6<aGFZ-rk(zPMabA-KQ*VB
z4j;5kE3!=d;F%iGwjLY73Ihv{%L2PJ)<61KWByl_wqHvpTR(=w_be7bjp}!O=2_G7
z&i;=BGVH3W`&|sXunXWavJSHG7hB6>-3GT6sIRko6&yMf3q^MaMa4a6s9S?9ilY^{
zTZkG~G{x8AdO{vxI#4REZMlTCij9LFL(4!3&wlbtQklAjkC)2T@jG(MCtbtb*vslj
z&#`fWfxpmOw<fRSvUhy$I-b6G&u(5P+)t<i7_3k|)LJT*(-aLZ5lN@X+Q6rBajk!n
zRYAE}N>gMkXBkPvSw`6nU_0R%WoZy+8QD5FWf}2HLMqKDTY{!6Bm3}`Sw`LcuPin>
zqO1j0l5xAWkxlxl;##6X;1g-`_Ep%gjfZ(KTHAx&>~KOSb=AKr>!geWR%JDD$G<wO
zNjLbbiz~gD?)+Di@zaEF0HXehx;=%K|Ff_sPPtd3AzxU;JG(F64=8Ln4G9B<&Smy<
zra`4{1A-nGlhqw1;iPB!I*uc9PNgy6Gtc2{7qFzmFiykn+037b(iVdt9=~-RR}*(`
z+zxI~vrNIy7HcyR-aMkY3e`5rd_r`_ZRYe!ZV(K7O0HHdn1ZUu$y5N<W)U706FjkE
zReTuQE9zFXvG`caZt-ZC!I-AW-DcW3{FtRJ58k{r92T96f?+%@G*`5dm-M5CNd=q0
zJXOiWfGiNrobApGuhlDUGC{mP(=m=lGPApKkDzt1c1A4uQ_1KR#-CtchMHEWS-FV{
zyRAYJn~SSkI;=tjO{i|})-1hP3RkSY+4+iqV1mNszy-sF)wx7#Ia5hR6f!GdUzxhz
z!MIGxyGuI8HO&s5(Qu1(MUGx^5XP&Rv@4o4TZ^lVLko)i7H!4j|0`A{lV)3Sealc*
zWe|9wR-ypjxkXs(KW@dEgxiXbdBvK9+a6!%ePt4Eul6;F-jCGR!v`PMS54dPSzk46
zw`YB2+U}_KH52Y1wXYAaSYlvD)>nyv9rSh9h>S7MuHq9d6P1N4h@`H(u`?Tn`h!y;
z^FDPA*IN?TV#}#%yrC(h{BxzQ9W~Hz^P;EXl1uKL$>!3lP?S9omuXIUSrF}7-|Vfy
zCTMp}YtohLkKGzkBx?<e_QKZ4tcc4rZ%v8T?4~szG~)G%)vTxPRH5ZJ8~4Pu3SZ^U
z_)R)Eo{6AwCN7&rlaM$83{J#3BAJzQR~Zb;El>p$<S9JQj6pdz)LQnKCq$Oyn*`%H
zat^9upd3mXxsky#F{Z9ob5N@dFkyFt?_5HW#JIeh2oFIsmx!S)nDdSk>1CXq5;ygu
z2r&lCMoanScLbYg>U^7FB*KY2k+a^K)Hj1)3R4&0w=giCm;JP?xFrL9b|c8H#uIaI
z<D|o!7fwxt64&ldPY4@pYWPH}w8XK(rc^sqb<#*^&0te+q~iVO^t=cXr-5l|r99%p
z+`!9MuQkuS{a8322E;T1A`(Nts}+$e^+H(#G9R01GlX;VYBqxSgn>R+2|zS=Q)Iw9
zDMZsqnY%6b)J_T9jOxEQGqk7|#3B_+SO{@hdKZt2ID!lv)u7@GYYv^p_L`>Ow8vrW
zsy=(<r)v%>Q$21OVITI>IB&e(8J4iHVhzs<*XE+mHrVvzuI<z?CdTU9vC7Gwk#=Xo
zW0l@B!`RNoEG@abY0lx{hvmI5U(srJX6$XgtBjSP#6^~6da1>omZVx48`TM1I$AJR
zi2%KfHkbBzHM@92-kqV;{Tp)kiU)d~ErgA<d9rB5{TWVvIcBiW=XI2*^8=MpwR*}E
z_z~aytX)>A{N;oYu;>-6oC3Fb!+<gVnCycXDAwU*Qr)Ilx(7|MjYdXOQCfi91z{c4
zEG^MI1w|(b?99@x1WUomVq=;j<4K$x`8SrtllXuN#rV{l6_fdDZ&pmpbuZqdLNOe&
zM!i`v<V{~zi~uR5OoOCut;T(L;SI%blo$17#YpsL#bm15kB_vFk+_0UKapZQ1xSAe
zf~UNwACP}4r*>$7=jvW8wEX=-yl6L<2{;&n*{%tHf2J}$$zzQx7TrTLTARC67VvPC
z5C>PqjO}>YK)~6%4wn?Uub8Y~3!d8z8X?My3Wj^?s@Z2VSPUpXRqKlR%~*tAZK?6>
zp=pvy8sQMdit2q(Mf7ucu<K<|O|=^;ZfZSjL6N(WzPIt(9yp3wbyuEL^+tN`?Gq<X
z$eA<Pd>^kMjjm4y$^ycu4*94Ct#4@UI-@fwC_99^D=~wju|~tiP5z0HPozxK&?kN4
zx=h1EiekfAF___eR!q!rJ}V~3^J@d^p_)<bJjHG^jGX?zRQFn;Wjtngo<D0Au_l?e
z%uht`f(1;H9G}Ju4$N_=tl#ZCN+WCH%-;?2U`LZh4SA^)qAnFnERh$BuSV7zQhd8u
zT4h8~FxBW~VyUX5B<Rh{#EbG28DHMGB~8(rmx-w=+8Nhh%8H40mxy~CiiviYHf~E(
z6uXoagLWUwiivg~Bl=+|rY3(Zt4*}~SXPY0D_Jp3omYr36^cnUeP!eJG^Lyr`_+1A
z&h5!e-Tgw#FVt)Eq)Q7}3UM=!oC@2ex$*m&3msu8Ht_>n;i=l3>KS|Sm<aitE=AXF
zaklRgFT*m<mc~5CLM^YSVQmcF7tLX*SU+>mSFLb%9B;NPOe~hlfkSGTL4r?#>gHIy
zSjDL?#2C!2d2#>=is><->6(jSM-E(PWmJG6-~<k{uTNWm>L3KDAzRDgy>7&?DANX>
zuS~lu9mie&Vr|XuFQ?EI%mJ@fN?+G)gQuPU)v&J79}WqK?T46Y(_4xVh@4{sD`3kA
zZQzC6<nHeHhPrVqg?nN0ZM9=}d?WNK`|y&~wl@0_1$9i42JMJvP?8Q1PO75~lvi>m
z4%#fxs<qA6n0MasjbWSW-CZGV4aof->aZ_qb(&A&vYFCqV}1p~jb>f0lYkv(eL1k0
zxY2Brf>W+gKwQ{y)|Z1w4E|PDOmpU~teED^TTMZ5kdb0<WyP2?b6GLXnYpZ(Am<3H
z9ct5@nahfin9qu7&dmGb6Df*qG~Z-rEHqNf%{;~4Ramk}4>Rr+A8&a_gChNf!BWVM
z2d4LE!{EA{Lb+$UscC71S<|RH-&LcWz}}fVQ+Y_mJ2>MouCpXmW^(|I=(AH|`w8w2
z9nw>bdoIdp7_Gj?82C3@eQ#|N|ML~hbVa}|)cshY(DFa8*c00ca_wXvca;%sLo1~;
z_s|b|CzU8Ps52h8lNS-Fe1!QTM7@H1+S+P&2`Hh)?_w?ca05@AbW-v{n*gyScYuP@
z_JQuev7Sg*Vu%}p<XBT^MK*g;PlGsk*u=FNYm{QjT4QQwYfU})B)?@&>QjPb%4~Oa
ze$32v+7#jc)mdW5ngskBZmXDf)tDOgLHhxOl;(1kOl&_OufI=}JZ+bHTM2k%6=|xQ
zs+54fr80dUzm`PkBqO;+8>rWV7?ifn3&WtBhaE4?)k%{^AmC@`R6(<}WippZbtCyv
zfN~O0Wn$Zq*mT!0*6?az&x~7<G8qx!Sm$_zn$u354FrRiaAO`8c1YsiAz1h<y4hV6
zo5V>EgC-C4+WW~xJ*PD0_&xY12@&a}3;yXsDMY@lM+#vBQCw#}cuC>ukz^@NlJ~tr
zc~zQZEqt$#JkI2)XZhyi7pq0lgOzObyvQPw<uz%NqF<~QMUi>GT2xM0Nv1^w{C>44
z0*NHG{?}TL3BUVOg}R?+lKyQL<n!4^B0bK$pRQPw4;XCi4doR7HW3S0B(=cV#@1EH
zFpu@JT|0F#AtXZz;fzrVuJ2YRZcS-VqEXQ{Sfk4@Pr;Zv1kj$4Wkd{Qa9UPzYBP21
z?Y69S?Rq6WLnJlUMEk4qPNjctZib_=o_S7UZ?l1xHzcnUCvjmv&7g);Nr_N#UUq7l
zwS-7z6Xu^!-%UX|gFvb2r8c;>Ii~lbfN2Ej<}IhW1VzFGvkn{ZGG~se5o<x=)<h#F
zfjSH|;l(>aqR}oAQ@3$DRAu{HZ)4_oQ6fwf6KzF!D8vx}hbF`?U_0H;G=A$Ya|y}^
zA}esEmWtWADO4S{eB*awwO^&#`BRcN;d6FW*2#<W5FUYX(t$5%n1@IOmN2<Cb=@EE
zSKR<(Lc`&2QvXwh(%Sf|TB$7F_E!tVO)WoOu)z!=L44#FDAK9^rjba!JzGvm8ExbV
zT=HOot8WHbt6q9^!{=OxLP8JtF;#U&x2br_eFSmg)D&4Mzt}X8IY|q{oDA{6zgk$i
zKK;t<_-cXuf##$|asC>;@sEl?OR_0V()F(uRyL<eihfN+Z(332<kt(u=9brB5WmqU
z*xt3u@yfp45;W>HUo5^Tp1`g^Xgc7l0%PVek=t(blAVJl4Yw`$9cCPWSmvTT>y)NE
zwS_4k0+4@QgA%%|DgX7ty7k^NQh(K3mYNeRZW-~J6#4W|+_H$4QCr$Fv>cLI%TRMj
z(z3s*xY!Lz!#4|c{}saMCyGH~utN<U@<0TmNsuKSw({UwfTUu@-enr<TESKd$tL6n
zzl5zflLVVAS83uf_e>(yZkA0WU|i5F*h?rl#nk*D+w^nz{4{>*4uhj6v5L)la(H$(
z8Ar5bUsg^*4*6lgVpyFEWWY>7!DeYjTQiO$>H2SqgkRT;YtWMO?E)cdzg(#F%7%hX
z4d<3Ai&;X_6y_4k*{UpMNqSy;@KivsGX%2feEV=MFn&)PCWHjkc!dy}`(LZH*?|S+
zr$d`|%PGU$%`^u=w9-u8=ynT~?fgj_v8|(#VGfdnDZX83dd&EfBt80eVQq+!MiQp@
zc7brVnu85mzJ7-Od0wrHBm+P3(Y~$?Gn6Dnf2LZLIry{HqM9Tm)1m_Y*}~co3AjNA
z10=IrN&Q^4sJNJ9T2x&8bJe2a;-6E|>(*fU`tyb225xMFx=^ENA=*vw2l;NR17x;^
z&_X}jd9Mv4KTmUC&^CF!69*qv8MiN^Dyz3@N?RpW<mU^e$DLBzYX5wp`HA?9wTisI
zz<pOsw{ORS1gfrpVFw|{6|C6S9*G=_`Qkz;9laHZL7;*JZLs^$Ur4nYl2rQ(1#V}?
zn9-O;|J_2}-(yCf%9-kjZCC{rl~8P%hL;QrzC{nT4Gqgs&>wW@&Z4F>bDIHNgVg_B
zUgsNwG-?9;QlS{ekrd=785&EH#{N>l;~tQt=r74)Rg#e;js2xUWgG6!i}j_X;g<__
z{{xLZTDibgf}Q2`%UZ~`BMZ)mPyskjzc<6_8~!ry&gqyxG>?0c`d?P_6ilJSK~KZ4
z6pH_SAp}z(&F5b!aMmOCE~)juTEJbn8bpfbk_^$RNs{+hWytMcY3{EU@CzP_^6}TI
zMYTGS3@cg5X2!3{pga`S%=k4GJx)){Ny9%V)csF|Lf5`M`p3?Ji4Sy}la4gpOO@!R
zEX-Fd=N=mXUV_*EgF@*^Ye!jK_)ekNWi^pv07!-bAW5^nQ)t?nex>Ml3YA@Hl4gCU
zK(G+?sH`dZ>s2J^pk#`q4*q(<BYBh8GFLhrNge!kA!#V%q~RYH>i)@}cqn<RUjGl(
zQ4M9Rq5MaM;y?DGB+ci4ln!MqI{ZeVJ~W6F%_SM68cFj0hRmZi9wce*Zxo(xw~oi^
z_-|H=s;49a&G=|vD{Wp>J^js4v{>JiH2kwd-T#8QiPi=l#n=C{LaAb?O={3@6^cP1
zkU|8I4B~<$d4H==UTLT#LH(@)n|F;wlN$8f)uNKRB-5g5&~F#YtG%ci^xM^<NZs#N
zi*h)kWRMn37S`swsk9(T(eJA0OI9nX-zgMZxGQI^VG2sWwxGJGwAqndjRhOW?K=8H
zZ)ASDl(30w8-u_)O%{d$;4DdZekWaj_)2$vN0#Fn8j{wE4I80Ev3_OJ@V$bW^N7B9
z3#k8Ifro^BG<T)w`$3_&<BxqfuKGZsHNXVolBA9g3Y)^jB}r>OC=i-O<FZoY@_nkb
zrjmlVBwNy?eccrJhOZR;ezhp$@`GwojSI=NsDOV^*c1Z7th90Y0Y$H1FpFcW1M%Nm
z8Sk39GO?F1OOyO3Jua8gdo|^T@6BZFR7U=jX2kxz<)NVrT0Yc>zLhsH=j>u}ggZ%0
zxT<E)D}!}&cl{T>wzaOcBVHNug}s6dTscm3t5mbyT{%+bm++bF4tt(GPO>pBS!Nl{
z%T~5L(x|K?yX*gg&`-xrDLTp|2Gt@9TBTc>R_JK0JwD8szfh1Jv+|!j{;}sCVncRi
zqT~9^-g`&);xX$k%4eW**MW{I{q|~GJ%9Gw<(P4+t806hdD+&?ylhm@zJhs~{VAt5
z4Ru@etIio4>vj^K$gb&|Fgk0wRjJZAvt&w-=j=Avlm<3r1L4N8*ScF7?R&v?!j+!c
zS=%SGnvZ)Z>2Q6HGC?2gfRaNdh7dJ7y*O-QiL}2lq*z&$*leh;YsAHFNQTQn8tz6}
zey6yaiK5fSV6e8jWF}flQA{RUf5R{6*3~r^TE1HFo`qqT;&D4%Q|sx2_SxYOm8D$D
zF@sJY$D}6P5dvEaw%hy~lw)NPQ`p&s=jUP~*jOpp;PllteeZlBFb_VL7XIoRSyj~8
zDYG;Y0C5_vE3HF<`-R*3Vz|2u7ia6e$Km2^z3Dx=0aK6HV{!3|>M@ghQ{C1=%eS%~
ztD*E)?X=Ejhb?xRLJw084SE+xB$;J|R6vd_5Wm<R&2hI^-DjmyfGTZiWMR8_&!LG?
zIjl$t@6E_AW+15TG{g)YcV;?tj2Fm&2#Pj2PZZ&aCySlN6U9b6C5L3V=Yl7;6t@}|
za6QJ^_!cC)c!CtC(_8!$ofL>$5^d(~8z5UYZ;8LAy(Xe@C$p&K%f+;znxH{5y-z$z
zovWxP6~(C55y%a;pwd=*GrHLd!}(N&1M1wNlUPjKc?)ZX3OzkD-I4o6TD49RJ+cj{
zVDrLZNBD_>umi8DbYX)R-*mf>VAg=~4Cgv_-Qq$fOs#MjM!>u3aVXc26C9{9?eg73
z{bpgctzkMG8U_uAh9wM#1jSBv6Qa3Yuk0!wHcFC!=DVEcq`1e})wC!5MzLK_OQB0I
zTXr2hlr1BFzdhc;JmI`!ZhY^=G^c)ZQ+IFMDv~CA5m}#R>&&ug4O#9Y)cUzX{3N%u
zFNxcYluXK(bY(Td85u`{$w2k#Ra4iI&WBdl`C$l}<|BHuMR?zczx8y>t^s_x2?;$g
z*!&2Xd7`1uPbTNnCtrF7*3{Mg(b^I~Iz!*WbFr4q@d`^<Uz3FwX5n+|Gx3^*)bNLB
zMOsj{PN}FZTJ{d5G~#cNzFCMLtCsZ+^wxHu;}IQLSgxkc$untvYC}`k_RfcE5uLe(
z*c-J}ciZD6$p4!0uYDR+&Yl__iyyDa?S0I>)T<Kco*2rW&#WAA+MbJ7Ues%_l+Adx
za}z}b7yXkDj4{e1Qa13rKlva*QJ=o2M_K+okUyTj2dOMa>u(n0RgUKk*$_7(AGF;x
zxcZSa$@7rn&3pE!rm5>uV^D)74mO(b41=P{sd$B&b8my5-!ygYeZ)A{VhpLVDM~#}
zzt=Jtm(t(zj~hOWZVBDGiUefAb%slmEkki!ts{^3p)V#MiFcCsbX-8pz1{UUvA%fm
z?&RFtqa1_dj5B#9*Y2H<=zQ8SAK#W;OXl-&`&1!b|4=!Q9C!r8LvyF~9{gy9yb;&p
zrW|u8yB`6P%ahi(XE|9zEjZH{i&q$zB-<ZR%z4N}am!O5o+(8=`)(y@zw-~%euH+4
zZctw*HxR`Jc4rNB>+MNJgEWB#RIK|kzp-!Q0mHKd<veYdGPgQr@6K_9V+x?#o#0HK
z`zV@+^3!vEKx!`cC4L~4s#5kjuO{7`d|Mk;Q@YNc8?)1D?r~6hSq@b(%_uk6b-7Yl
z5tP@MEss*DC*|GG#PEsQNX}KoD=l~bjka+b-6W@M=vX}8Tq&lj8q69?Euy)ro;>PZ
zVRIR+>U|^rOlU6O))rrAxxc8nv#E{^ZT>{Gb)XNWuc)@R!Hg(qu*~q+CfYfR_OjAg
zyZ2C<qWNnN55$*@*d*2!pJ^GajNZLs(F?U>vB>rugpXr>d@XmecXw8ImC~1G*=d5E
ztC?F|JJ>n<w6f~jGE^%yY8?>+Jw=n&tu*5hnj{O5b=!BR-_(jdM|k#QJF|^a=Ra0C
zA1t7CVp^qO;LGvrx)zanCl`Y=(~Ad^4anVjHHu9c<~W%AhnE}x<@RA4aW0|5g*tYL
z^)2;Ju26fFqU9|sb>+;yjKGG>noXq*9ECN8B&zl%jxn<|**C3zyqcyvn>c>X_HkS4
zgC!qG^m|Kvejm4`WEAp!+!o$sFoSiVy{&GS&0yOkZ7c1tmKM~~*5XsadX5xTw-P;3
zEhVLvZm(ZwEwLmm-Ckd=rpdmY>}t7vr={Du5kHsizwmq2@_c0svf2XAUTKc=XOy+@
z3dc=BxClbE3>!qV*TziXK6V1vxK6nm#$UTM`nt1b2e;GCe$yS?PL9g|y|966uiIZ}
znOW|LBVXE6V+QtMjHyfz{V&}y&;;KR1a)86i1T-66@iIHhm6h!nm6s3CLV$UY@2X_
z%8Ro$*_*OC30r*OGbOG~qT7TWT#dBwy;mm(ed3<5_v++y(NmDPlihinRX}a~s9+O2
z&PkY;oz@KVNbxq|R8u<B{hZ8!_Z1r)Me=B0V~QyWv=2;i3fs8@b<YM)(TqC)ql%{^
zamvBs;lL@R_;%1ag_OE_$T`K5RCmZZ#nNOy<eXw@syyVJVtXQd1pRB`l(3IF>YPG~
zs*gISkfP$FaEb;9TQod_7WXkgJ$`3`d@`FvS>lTeB-gVaoE0esD|T~ss39RG6x^eE
ziVC_r_j0f)%dPt3bv?QU$qAo_$Z?ZGyl=7Nfnc$r^AzVPnT8!NwGekz)-4eF`Qo~k
zr)^dRtSURr-@O8RF>~f-Zr84vD#@5U?`%a1)aS8-QL9PO>gO2`u>hy2y}UW$Z?j5>
zdQ0+u6KoQ&4G)%eT=)Z*T8i8Cf7It(N(#6>I4TsQCVa<OO;`d@tltNRl)m}kkfK;W
zgYz1#;B;=F?xjM@ixpR#B)GYy_ElthGH=|PGZDElj@9%PML-WnDVm~wDrKsO6IJh#
z2GC>vAiev=KKhB44+?OCFGP&K(bBb$#ft(+m0`&OviXASD;m?$m7sY{6Ex4w(j)+<
z=Uic)S|EX;8B`?Gi?jmeZKFbQ7ExJ|sX3fKjLpcLL*|ItukE^MwB;+*(fZWu*#n*Q
zVG2g7!QRT3RNZ(p7Q@aFc6%HRm%}*O<#9C3q1gWw2n4w<aG&tIk0#JV7tVk8X(WEV
zkkLr|dZ8SQ!R?kjy1@O0<~p7qFV)R!uJ_~^LW~(kmW5;)Y^jH7mrCpHTBK1T_m$#!
z)N;7e??+mx^}%9p<X{=b4<qcHVlxgDFkgvv6WUNuN)qJN`k-D|k`BIFAKM~sX|liC
zw7QyRQohQ?Qd*qPueqdGcG2fGm-Lp_cbD{*rub_}7K|)H^(by{)UR*(vqUMkRncbW
z+}&UbwvcpE1AI3t&X>KG8T9aLupGaOIeSpdJljHqV1c{v*DyhYQUaz;Ie1lyj2exF
z1C1<I({$>M@?+IBoqB`!i~WejMwZF?iQ-h$a%9mkJ#<clk&+%+J5J)QiC89&A`}Ww
z5?$p2JG6-;ZMvEfnl#z3k~#ZMo30`})8c%d%*Kgl9u%L<6<2MO**Ni?;*-^J;(<pJ
z-T1eAoM<DRx{-|&X*zWy8>jF{<wiPABIqq1xE{5oGwe&5NA|2xa<?kRZPtqQs!PbY
zE?l%$V(UPqw_GBaAw+bGD*YQ&yhVi_VhlY^nJLaiEnBTdJ1Ysopaweywzn%YEQVS&
z8`YIr#xLMX<Cw)ouc!2FRam>pNS(8cTqwq{y;ZL(S2a~zwYU5c3Mq=cwI+q+#yEQG
Ki4EzA^8W{UHplJ&

diff --git a/crates/cnidarium/src/lib.rs b/crates/cnidarium/src/lib.rs
deleted file mode 100644
index 91c90a000c..0000000000
--- a/crates/cnidarium/src/lib.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-//! Storage and management of chain state, backed by Jellyfish Merkle Trees and RocksDB.
-//!
-//! This crate provides a versioned, verifiable key-value store that also
-//! supports lightweight, copy-on-write snapshots and transactional semantics.
-//! The [`Storage`] type is a handle for an instance of a backing store,
-//! implemented using RocksDB.  The storage records a sequence of versioned
-//! [`Snapshot`]s.  The [`Snapshot`] type is a lightweight snapshot of a particular
-//! version of the chain state.
-//!
-//! Each [`Snapshot`] instance can also be used as the basis for a copy-on-write
-//! fork to build up changes before committing them to persistent storage.  The
-//! [`StateDelta`] type collects a group of writes, which can then be applied to
-//! the (in-memory) [`StateDelta`] overlay.  Finally, the changes accumulated in the
-//! [`StateDelta`] instance can be committed to the persistent [`Storage`].
-//!
-//! Reads are performed with the [`StateRead`] trait, implemented by both
-//! [`Snapshot`] and [`StateDelta`], and reflect any currently cached writes.
-//! Writes are performed with the [`StateWrite`] trait, which is only
-//! implemented for [`StateDelta`].
-//!
-//! The storage system provides three data stores:
-//!
-//! * A verifiable key-value store, with UTF-8 keys and byte values, backed by
-//! the Jellyfish Merkle Tree.  The JMT is a sparse merkle tree that records
-//! hashed keys, so we also record an index of the keys themselves to allow
-//! range queries on keys rather than key hashes. This index, however, is not
-//! part of the verifiable consensus state.
-//!
-//! * A secondary, non-verifiable key-value store with byte keys and byte
-//! values, backed directly by RocksDB.  This is intended for use building
-//! application-specific indexes of the verifiable consensus state.
-//!
-//! * A tertiary, in-memory object store. This is intended for use implementing
-//! accumulators, like lists of data to be batch-processed at the end of the
-//! block.  The object store clones on read to prevent violations of
-//! transactional semantics, so it should be used with immutable data structures
-//! like those in the `im` crate that implement copy-on-write behavior
-//! internally.
-//!
-//! The storage system also supports prefixed "substores", somewhat similar to
-//! the Cosmos SDK's multistore design. Each substore has a separate JMT, whose
-//! root hash is written into the base store under the prefix.  This allows use
-//! cases like storing IBC data in a subtree.  The substore's non-verifiable
-//! store is also stored in a separate RocksDB column family, allowing storage
-//! optimizations.
-//!
-//! Remember that the chain state is a public API.  Mapping from raw byte values
-//! to typed data should be accomplished by means of extension traits.  For
-//! instance, the `penumbra_proto` crate provides an extension trait to
-//! automatically (de)serialize into proto or domain types, allowing its use as
-//! an object store.
-//!
-//! With the `rpc` feature enabled, this crate also provides a GRPC interface to
-//! the key-value store using Tonic.
-#![deny(clippy::unwrap_used)]
-// Requires nightly.
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
-// We use `HashMap`s opportunistically.
-#![allow(clippy::disallowed_types)]
-
-mod cache;
-mod delta;
-mod escaped_byte_slice;
-mod metrics;
-mod read;
-mod snapshot;
-mod snapshot_cache;
-mod storage;
-mod store;
-#[cfg(test)]
-mod tests;
-mod utils;
-mod write;
-mod write_batch;
-
-#[cfg(feature = "metrics")]
-pub use crate::metrics::register_metrics;
-pub use cache::Cache;
-pub use delta::{ArcStateDeltaExt, StateDelta};
-pub use escaped_byte_slice::EscapedByteSlice;
-pub use jmt::{ics23_spec, RootHash};
-pub use read::StateRead;
-pub use snapshot::Snapshot;
-pub use storage::{Storage, TempStorage};
-pub use write::StateWrite;
-pub use write_batch::StagedWriteBatch;
-
-pub mod future;
-
-#[cfg(feature = "rpc")]
-pub mod rpc;
diff --git a/crates/cnidarium/src/metrics.rs b/crates/cnidarium/src/metrics.rs
deleted file mode 100644
index 4eef4590dc..0000000000
--- a/crates/cnidarium/src/metrics.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-#![cfg(feature = "metrics")]
-//! Crate-specific metrics functionality.
-//!
-//! This module re-exports the contents of the `metrics` crate.  This is
-//! effectively a way to monkey-patch the functions in this module into the
-//! `metrics` crate, at least from the point of view of the other code in this
-//! crate.
-//!
-//! Code in this crate that wants to use metrics should `use crate::metrics;`,
-//! so that this module shadows the `metrics` crate.
-//!
-//! This trick is probably good to avoid in general, because it could be
-//! confusing, but in this limited case, it seems like a clean option.
-
-pub use metrics::*;
-
-/// Registers all metrics used by this crate.
-pub fn register_metrics() {
-    describe_histogram!(
-        STORAGE_GET_RAW_DURATION,
-        Unit::Seconds,
-        "The duration of a get_raw request"
-    );
-    describe_histogram!(
-        STORAGE_NONCONSENSUS_GET_RAW_DURATION,
-        Unit::Seconds,
-        "The duration of a nonverifiable_get_raw request"
-    );
-}
-
-pub const STORAGE_GET_RAW_DURATION: &str = "cnidarium_get_raw_duration_seconds";
-pub const STORAGE_NONCONSENSUS_GET_RAW_DURATION: &str =
-    "cnidarium_nonverifiable_get_raw_duration_seconds";
diff --git a/crates/cnidarium/src/read.rs b/crates/cnidarium/src/read.rs
deleted file mode 100644
index 30d1135432..0000000000
--- a/crates/cnidarium/src/read.rs
+++ /dev/null
@@ -1,247 +0,0 @@
-use std::{any::Any, future::Future, ops::RangeBounds, sync::Arc};
-
-use anyhow::Result;
-use futures::Stream;
-
-/// Read access to chain state.
-pub trait StateRead: Send + Sync {
-    type GetRawFut: Future<Output = Result<Option<Vec<u8>>>> + Send + 'static;
-    type PrefixRawStream: Stream<Item = Result<(String, Vec<u8>)>> + Send + 'static;
-    type PrefixKeysStream: Stream<Item = Result<String>> + Send + 'static;
-    type NonconsensusPrefixRawStream: Stream<Item = Result<(Vec<u8>, Vec<u8>)>> + Send + 'static;
-    type NonconsensusRangeRawStream: Stream<Item = Result<(Vec<u8>, Vec<u8>)>> + Send + 'static;
-
-    /// Gets a value from the verifiable key-value store as raw bytes.
-    ///
-    /// Users should generally prefer to use `get` or `get_proto` from an extension trait.
-    fn get_raw(&self, key: &str) -> Self::GetRawFut;
-
-    /// Gets a byte value from the non-verifiable key-value store.
-    ///
-    /// This is intended for application-specific indexes of the verifiable
-    /// consensus state, rather than for use as a primary data storage method.
-    fn nonverifiable_get_raw(&self, key: &[u8]) -> Self::GetRawFut;
-
-    /// Gets an object from the ephemeral key-object store.
-    ///
-    /// This is intended to allow application components to build up batched
-    /// data transactionally, ensuring that a transaction's contributions to
-    /// some batched data are only included if the entire transaction executed
-    /// successfully.  This data is not persisted to the `Storage` during
-    /// `commit`.
-    ///
-    /// # Returns
-    ///
-    /// - `Some(&T)` if a value of type `T` was present at `key`.
-    /// - `None` if `key` was not present.
-    ///
-    /// # Panics
-    ///
-    /// If there *is* a value at `key` but it is not of the type requested.
-    fn object_get<T: Any + Send + Sync + Clone>(&self, key: &'static str) -> Option<T>;
-
-    /// Gets the [`TypeId`] of the object stored at `key` in the ephemeral key-object store, if any
-    /// is present.
-    fn object_type(&self, key: &'static str) -> Option<std::any::TypeId>;
-
-    /// Retrieve all values for keys matching a prefix from the verifiable key-value store, as raw bytes.
-    ///
-    /// Users should generally prefer to use `prefix` or `prefix_proto` from an extension trait.
-    fn prefix_raw(&self, prefix: &str) -> Self::PrefixRawStream;
-
-    /// Retrieve all keys (but not values) matching a prefix from the verifiable key-value store.
-    fn prefix_keys(&self, prefix: &str) -> Self::PrefixKeysStream;
-
-    /// Retrieve all values for keys matching a prefix from the non-verifiable key-value store, as raw bytes.
-    ///
-    /// Users should generally prefer to use wrapper methods in an extension trait.
-    fn nonverifiable_prefix_raw(&self, prefix: &[u8]) -> Self::NonconsensusPrefixRawStream;
-
-    /// Retrieve all values for keys in a range from the non-verifiable key-value store, as raw bytes.
-    /// This method does not support inclusive ranges, and will return an error if passed one.
-    ///
-    /// Users should generally prefer to use wrapper methods in an extension trait.
-    fn nonverifiable_range_raw(
-        &self,
-        prefix: Option<&[u8]>,
-        range: impl RangeBounds<Vec<u8>>,
-    ) -> Result<Self::NonconsensusRangeRawStream>;
-}
-
-impl<'a, S: StateRead + Send + Sync> StateRead for &'a S {
-    type GetRawFut = S::GetRawFut;
-    type PrefixRawStream = S::PrefixRawStream;
-    type PrefixKeysStream = S::PrefixKeysStream;
-    type NonconsensusPrefixRawStream = S::NonconsensusPrefixRawStream;
-    type NonconsensusRangeRawStream = S::NonconsensusRangeRawStream;
-
-    fn get_raw(&self, key: &str) -> Self::GetRawFut {
-        (**self).get_raw(key)
-    }
-
-    fn prefix_raw(&self, prefix: &str) -> S::PrefixRawStream {
-        (**self).prefix_raw(prefix)
-    }
-
-    fn prefix_keys(&self, prefix: &str) -> S::PrefixKeysStream {
-        (**self).prefix_keys(prefix)
-    }
-
-    fn nonverifiable_prefix_raw(&self, prefix: &[u8]) -> S::NonconsensusPrefixRawStream {
-        (**self).nonverifiable_prefix_raw(prefix)
-    }
-
-    fn nonverifiable_range_raw(
-        &self,
-        prefix: Option<&[u8]>,
-        range: impl std::ops::RangeBounds<Vec<u8>>,
-    ) -> anyhow::Result<Self::NonconsensusRangeRawStream> {
-        (**self).nonverifiable_range_raw(prefix, range)
-    }
-
-    fn nonverifiable_get_raw(&self, key: &[u8]) -> Self::GetRawFut {
-        (**self).nonverifiable_get_raw(key)
-    }
-
-    fn object_get<T: Any + Send + Sync + Clone>(&self, key: &'static str) -> Option<T> {
-        (**self).object_get(key)
-    }
-
-    fn object_type(&self, key: &'static str) -> Option<std::any::TypeId> {
-        (**self).object_type(key)
-    }
-}
-
-impl<'a, S: StateRead + Send + Sync> StateRead for &'a mut S {
-    type GetRawFut = S::GetRawFut;
-    type PrefixRawStream = S::PrefixRawStream;
-    type PrefixKeysStream = S::PrefixKeysStream;
-    type NonconsensusPrefixRawStream = S::NonconsensusPrefixRawStream;
-    type NonconsensusRangeRawStream = S::NonconsensusRangeRawStream;
-
-    fn get_raw(&self, key: &str) -> Self::GetRawFut {
-        (**self).get_raw(key)
-    }
-
-    fn prefix_raw(&self, prefix: &str) -> S::PrefixRawStream {
-        (**self).prefix_raw(prefix)
-    }
-
-    fn prefix_keys(&self, prefix: &str) -> S::PrefixKeysStream {
-        (**self).prefix_keys(prefix)
-    }
-
-    fn nonverifiable_prefix_raw(&self, prefix: &[u8]) -> S::NonconsensusPrefixRawStream {
-        (**self).nonverifiable_prefix_raw(prefix)
-    }
-
-    fn nonverifiable_range_raw(
-        &self,
-        prefix: Option<&[u8]>,
-        range: impl RangeBounds<Vec<u8>>,
-    ) -> Result<S::NonconsensusRangeRawStream> {
-        (**self).nonverifiable_range_raw(prefix, range)
-    }
-
-    fn nonverifiable_get_raw(&self, key: &[u8]) -> Self::GetRawFut {
-        (**self).nonverifiable_get_raw(key)
-    }
-
-    fn object_get<T: Any + Send + Sync + Clone>(&self, key: &'static str) -> Option<T> {
-        (**self).object_get(key)
-    }
-
-    fn object_type(&self, key: &'static str) -> Option<std::any::TypeId> {
-        (**self).object_type(key)
-    }
-}
-
-impl<S: StateRead + Send + Sync> StateRead for Arc<S> {
-    type GetRawFut = S::GetRawFut;
-    type PrefixRawStream = S::PrefixRawStream;
-    type PrefixKeysStream = S::PrefixKeysStream;
-    type NonconsensusPrefixRawStream = S::NonconsensusPrefixRawStream;
-    type NonconsensusRangeRawStream = S::NonconsensusRangeRawStream;
-
-    fn get_raw(&self, key: &str) -> Self::GetRawFut {
-        (**self).get_raw(key)
-    }
-
-    fn prefix_raw(&self, prefix: &str) -> S::PrefixRawStream {
-        (**self).prefix_raw(prefix)
-    }
-
-    fn prefix_keys(&self, prefix: &str) -> S::PrefixKeysStream {
-        (**self).prefix_keys(prefix)
-    }
-
-    fn nonverifiable_prefix_raw(&self, prefix: &[u8]) -> S::NonconsensusPrefixRawStream {
-        (**self).nonverifiable_prefix_raw(prefix)
-    }
-
-    fn nonverifiable_range_raw(
-        &self,
-        prefix: Option<&[u8]>,
-        range: impl RangeBounds<Vec<u8>>,
-    ) -> Result<Self::NonconsensusRangeRawStream> {
-        (**self).nonverifiable_range_raw(prefix, range)
-    }
-
-    fn nonverifiable_get_raw(&self, key: &[u8]) -> Self::GetRawFut {
-        (**self).nonverifiable_get_raw(key)
-    }
-
-    fn object_get<T: Any + Send + Sync + Clone>(&self, key: &'static str) -> Option<T> {
-        (**self).object_get(key)
-    }
-
-    fn object_type(&self, key: &'static str) -> Option<std::any::TypeId> {
-        (**self).object_type(key)
-    }
-}
-
-impl StateRead for () {
-    type GetRawFut = futures::future::Ready<Result<Option<Vec<u8>>>>;
-    type PrefixRawStream = futures::stream::Iter<std::iter::Empty<Result<(String, Vec<u8>)>>>;
-    type PrefixKeysStream = futures::stream::Iter<std::iter::Empty<Result<String>>>;
-    type NonconsensusPrefixRawStream =
-        futures::stream::Iter<std::iter::Empty<Result<(Vec<u8>, Vec<u8>)>>>;
-    type NonconsensusRangeRawStream =
-        futures::stream::Iter<std::iter::Empty<Result<(Vec<u8>, Vec<u8>)>>>;
-
-    fn get_raw(&self, _key: &str) -> Self::GetRawFut {
-        futures::future::ready(Ok(None))
-    }
-
-    fn nonverifiable_get_raw(&self, _key: &[u8]) -> Self::GetRawFut {
-        futures::future::ready(Ok(None))
-    }
-
-    fn object_get<T: Any + Send + Sync + Clone>(&self, _key: &'static str) -> Option<T> {
-        None
-    }
-
-    fn object_type(&self, _key: &'static str) -> Option<std::any::TypeId> {
-        None
-    }
-
-    fn prefix_raw(&self, _prefix: &str) -> Self::PrefixRawStream {
-        futures::stream::iter(std::iter::empty())
-    }
-
-    fn prefix_keys(&self, _prefix: &str) -> Self::PrefixKeysStream {
-        futures::stream::iter(std::iter::empty())
-    }
-
-    fn nonverifiable_prefix_raw(&self, _prefix: &[u8]) -> Self::NonconsensusPrefixRawStream {
-        futures::stream::iter(std::iter::empty())
-    }
-
-    fn nonverifiable_range_raw(
-        &self,
-        _prefix: Option<&[u8]>,
-        _range: impl RangeBounds<Vec<u8>>,
-    ) -> Result<Self::NonconsensusRangeRawStream> {
-        Ok(futures::stream::iter(std::iter::empty()))
-    }
-}
diff --git a/crates/cnidarium/src/rpc.rs b/crates/cnidarium/src/rpc.rs
deleted file mode 100644
index 525c42e2e0..0000000000
--- a/crates/cnidarium/src/rpc.rs
+++ /dev/null
@@ -1,256 +0,0 @@
-// Autogen code isn't clippy clean:
-#[allow(clippy::unwrap_used)]
-pub mod proto {
-    pub mod v1 {
-        include!("gen/penumbra.cnidarium.v1.rs");
-        include!("gen/penumbra.cnidarium.v1.serde.rs");
-    }
-
-    // https://github.com/penumbra-zone/penumbra/issues/3038#issuecomment-1722534133
-    pub const FILE_DESCRIPTOR_SET: &[u8] = include_bytes!("gen/proto_descriptor.bin.no_lfs");
-}
-
-pub struct Server {
-    storage: Storage,
-}
-
-impl Server {
-    pub fn new(storage: Storage) -> Self {
-        Self { storage }
-    }
-}
-use std::pin::Pin;
-
-use crate::read::StateRead;
-use crate::rpc::proto::v1::{
-    key_value_response::Value as JMTValue, non_verifiable_key_value_response::Value as NVValue,
-    query_service_server::QueryService, watch_response as wr, KeyValueRequest, KeyValueResponse,
-    NonVerifiableKeyValueRequest, NonVerifiableKeyValueResponse, PrefixValueRequest,
-    PrefixValueResponse, WatchRequest, WatchResponse,
-};
-use futures::{StreamExt, TryStreamExt};
-use regex::Regex;
-use tokio_stream::wrappers::ReceiverStream;
-use tonic::Status;
-use tracing::instrument;
-
-use crate::Storage;
-
-#[tonic::async_trait]
-impl QueryService for Server {
-    #[instrument(skip(self, request))]
-    async fn non_verifiable_key_value(
-        &self,
-        request: tonic::Request<NonVerifiableKeyValueRequest>,
-    ) -> Result<tonic::Response<NonVerifiableKeyValueResponse>, Status> {
-        let state = self.storage.latest_snapshot();
-        let request = request.into_inner();
-
-        if request.key.is_none() || request.key.as_ref().expect("key is Some").inner.is_empty() {
-            return Err(Status::invalid_argument("key is empty"));
-        }
-
-        let key = request.key.expect("key is Some").inner;
-        let some_value = state
-            .nonverifiable_get_raw(&key)
-            .await
-            .map_err(|e| tonic::Status::internal(e.to_string()))?;
-
-        Ok(tonic::Response::new(NonVerifiableKeyValueResponse {
-            value: some_value.map(|value| NVValue { value }),
-        }))
-    }
-
-    #[instrument(skip(self, request))]
-    async fn key_value(
-        &self,
-        request: tonic::Request<KeyValueRequest>,
-    ) -> Result<tonic::Response<KeyValueResponse>, Status> {
-        let state = self.storage.latest_snapshot();
-        // We map the error here to avoid including `tonic` as a dependency
-        // in the `chain` crate, to support its compilation to wasm.
-        let request = request.into_inner();
-        tracing::debug!(?request, "processing key_value request");
-
-        if request.key.is_empty() {
-            return Err(Status::invalid_argument("key is empty"));
-        }
-
-        let (some_value, proof) = {
-            // Don't generate the proof if the request doesn't ask for it.
-            let (v, p) = if request.proof {
-                let (v, p) = state
-                    .get_with_proof(request.key.into_bytes())
-                    .await
-                    .map_err(|e| tonic::Status::internal(e.to_string()))?;
-                (v, Some(p))
-            } else {
-                (
-                    state
-                        .get_raw(&request.key)
-                        .await
-                        .map_err(|e| tonic::Status::internal(e.to_string()))?,
-                    None,
-                )
-            };
-            (v, p)
-        };
-
-        Ok(tonic::Response::new(KeyValueResponse {
-            value: some_value.map(|value| JMTValue { value }),
-            proof: if request.proof {
-                Some(ibc_proto::ibc::core::commitment::v1::MerkleProof {
-                    proofs: proof
-                        .expect("proof should be present")
-                        .proofs
-                        .into_iter()
-                        .map(|p| {
-                            let mut encoded = Vec::new();
-                            prost::Message::encode(&p, &mut encoded).expect("able to encode proof");
-                            prost::Message::decode(&*encoded).expect("able to decode proof")
-                        })
-                        .collect(),
-                })
-            } else {
-                None
-            },
-        }))
-    }
-
-    type PrefixValueStream =
-        Pin<Box<dyn futures::Stream<Item = Result<PrefixValueResponse, tonic::Status>> + Send>>;
-
-    #[instrument(skip(self, request))]
-    async fn prefix_value(
-        &self,
-        request: tonic::Request<PrefixValueRequest>,
-    ) -> Result<tonic::Response<Self::PrefixValueStream>, Status> {
-        let state = self.storage.latest_snapshot();
-        let request = request.into_inner();
-        tracing::debug!(?request);
-
-        if request.prefix.is_empty() {
-            return Err(Status::invalid_argument("prefix is empty"));
-        }
-
-        Ok(tonic::Response::new(
-            state
-                .prefix_raw(&request.prefix)
-                .map_ok(|i: (String, Vec<u8>)| {
-                    let (key, value) = i;
-                    PrefixValueResponse { key, value }
-                })
-                .map_err(|e: anyhow::Error| {
-                    tonic::Status::unavailable(format!(
-                        "error getting prefix value from storage: {e}"
-                    ))
-                })
-                .boxed(),
-        ))
-    }
-
-    type WatchStream = ReceiverStream<Result<WatchResponse, tonic::Status>>;
-
-    #[instrument(skip(self, request))]
-    async fn watch(
-        &self,
-        request: tonic::Request<WatchRequest>,
-    ) -> Result<tonic::Response<Self::WatchStream>, Status> {
-        let request = request.into_inner();
-        tracing::debug!(?request);
-
-        const MAX_REGEX_LEN: usize = 1024;
-
-        let key_regex = match request.key_regex.as_str() {
-            "" => None,
-            _ => Some(
-                regex::RegexBuilder::new(&request.key_regex)
-                    .size_limit(MAX_REGEX_LEN)
-                    .build()
-                    .map_err(|e| Status::invalid_argument(format!("invalid key_regex: {}", e)))?,
-            ),
-        };
-
-        // Use the `bytes` regex to allow matching byte strings.
-        let nv_key_regex = match request.nv_key_regex.as_str() {
-            "" => None,
-            _ => Some(
-                regex::bytes::RegexBuilder::new(&request.nv_key_regex)
-                    .size_limit(MAX_REGEX_LEN)
-                    .unicode(false)
-                    .build()
-                    .map_err(|e| {
-                        Status::invalid_argument(format!("invalid nv_key_regex: {}", e))
-                    })?,
-            ),
-        };
-
-        let (tx, rx) = tokio::sync::mpsc::channel::<Result<WatchResponse, tonic::Status>>(10);
-
-        tokio::spawn(watch_changes(
-            self.storage.clone(),
-            key_regex,
-            nv_key_regex,
-            tx,
-        ));
-
-        Ok(tonic::Response::new(ReceiverStream::new(rx)))
-    }
-}
-
-async fn watch_changes(
-    storage: Storage,
-    key_regex: Option<regex::Regex>,
-    nv_key_regex: Option<regex::bytes::Regex>,
-    tx: tokio::sync::mpsc::Sender<Result<WatchResponse, tonic::Status>>,
-) -> anyhow::Result<()> {
-    let mut changes_rx = storage.subscribe_changes();
-    while !tx.is_closed() {
-        // Wait for a new set of changes, reporting an error if we don't get one.
-        if let Err(e) = changes_rx.changed().await {
-            tx.send(Err(tonic::Status::internal(e.to_string()))).await?;
-        }
-        let (version, changes) = changes_rx.borrow_and_update().clone();
-
-        if key_regex.is_some() || nv_key_regex.is_none() {
-            for (key, value) in changes.unwritten_changes().iter() {
-                if key_regex
-                    .as_ref()
-                    .unwrap_or(&Regex::new(r"").expect("empty regex ok"))
-                    .is_match(key)
-                {
-                    tx.send(Ok(WatchResponse {
-                        version,
-                        entry: Some(wr::Entry::Kv(wr::KeyValue {
-                            key: key.clone(),
-                            value: value.as_ref().cloned().unwrap_or_default(),
-                            deleted: value.is_none(),
-                        })),
-                    }))
-                    .await?;
-                }
-            }
-        }
-
-        if nv_key_regex.is_some() || key_regex.is_none() {
-            for (key, value) in changes.nonverifiable_changes().iter() {
-                if nv_key_regex
-                    .as_ref()
-                    .unwrap_or(&regex::bytes::Regex::new(r"").expect("empty regex ok"))
-                    .is_match(key)
-                {
-                    tx.send(Ok(WatchResponse {
-                        version,
-                        entry: Some(wr::Entry::NvKv(wr::NvKeyValue {
-                            key: key.clone(),
-                            value: value.as_ref().cloned().unwrap_or_default(),
-                            deleted: value.is_none(),
-                        })),
-                    }))
-                    .await?;
-                }
-            }
-        }
-    }
-    return Ok(());
-}
diff --git a/crates/cnidarium/src/snapshot.rs b/crates/cnidarium/src/snapshot.rs
deleted file mode 100644
index eb3518805a..0000000000
--- a/crates/cnidarium/src/snapshot.rs
+++ /dev/null
@@ -1,558 +0,0 @@
-use std::iter;
-use std::{any::Any, sync::Arc};
-
-use anyhow::Result;
-use async_trait::async_trait;
-use ibc_types::core::commitment::MerkleProof;
-use tokio::sync::mpsc;
-use tracing::Span;
-
-#[cfg(feature = "metrics")]
-use crate::metrics;
-use crate::store::multistore::{self, MultistoreCache};
-use crate::{store, StateRead};
-
-mod rocks_wrapper;
-
-pub(crate) use rocks_wrapper::RocksDbSnapshot;
-
-/// A snapshot of the underlying storage at a specific state version, suitable
-/// for read-only access by multiple threads, e.g., RPC calls.
-///
-/// Snapshots are cheap to create and clone.  Internally, they're implemented as
-/// a wrapper around a [RocksDB snapshot](https://github.com/facebook/rocksdb/wiki/Snapshot)
-/// with a pinned JMT version number for the snapshot.
-#[derive(Clone)]
-pub struct Snapshot(pub(crate) Arc<Inner>);
-
-// We don't want to expose the `TreeReader` implementation outside of this crate.
-#[derive(Debug)]
-pub(crate) struct Inner {
-    /// Tracks the latest version of each substore, and routes keys to the correct substore.
-    pub(crate) multistore_cache: MultistoreCache,
-    /// A handle to the underlying RocksDB snapshot.
-    pub(crate) snapshot: Arc<RocksDbSnapshot>,
-    /// The version of the main JMT tree.
-    pub(crate) version: jmt::Version,
-    // Used to retrieve column family handles.
-    pub(crate) db: Arc<rocksdb::DB>,
-}
-
-impl Snapshot {
-    /// Creates a new `Snapshot` with the given version and substore configs.
-    pub(crate) fn new(
-        db: Arc<rocksdb::DB>,
-        version: jmt::Version,
-        multistore_cache: multistore::MultistoreCache,
-    ) -> Self {
-        Self(Arc::new(Inner {
-            snapshot: Arc::new(RocksDbSnapshot::new(db.clone())),
-            version,
-            db,
-            multistore_cache,
-        }))
-    }
-
-    pub fn version(&self) -> jmt::Version {
-        self.0.version
-    }
-
-    /// Returns some value corresponding to the key, along with an ICS23 existence proof
-    /// up to the current JMT root hash. If the key is not present, returns `None` and a
-    /// non-existence proof.
-    pub async fn get_with_proof(&self, key: Vec<u8>) -> Result<(Option<Vec<u8>>, MerkleProof)> {
-        if key.is_empty() {
-            anyhow::bail!("empty keys are not allowed")
-        }
-
-        let span = tracing::Span::current();
-        let rocksdb_snapshot = self.0.snapshot.clone();
-        let db = self.0.db.clone();
-        let mut proofs = vec![];
-
-        let (substore_key, substore_config) = self.0.multistore_cache.config.route_key_bytes(&key);
-        let substore_key_bytes = substore_key.to_vec();
-        let substore_version = self.substore_version(&substore_config).unwrap_or(u64::MAX);
-        let key_to_substore_root = substore_config.prefix.clone();
-
-        let substore = store::substore::SubstoreSnapshot {
-            config: substore_config,
-            rocksdb_snapshot: rocksdb_snapshot.clone(),
-            version: substore_version,
-            db: db.clone(),
-        };
-
-        let (substore_value, substore_commitment_proof) = tokio::task::spawn_blocking({
-            let span = span.clone();
-            move || span.in_scope(|| substore.get_with_proof(substore_key_bytes))
-        })
-        .await??;
-
-        proofs.push(substore_commitment_proof);
-
-        // in the case where we request a proof for a key that is in a substore, also get a proof from the root to the substore key.
-        if !key_to_substore_root.is_empty() {
-            let main_store_config = self.0.multistore_cache.config.main_store.clone();
-            let main_version = self
-                .substore_version(&main_store_config)
-                .unwrap_or(u64::MAX);
-            let mainstore = store::substore::SubstoreSnapshot {
-                config: main_store_config,
-                rocksdb_snapshot,
-                version: main_version,
-                db,
-            };
-
-            let (_, main_commitment_proof) = tokio::task::spawn_blocking({
-                let span = span.clone();
-                move || span.in_scope(|| mainstore.get_with_proof(key_to_substore_root.into()))
-            })
-            .await??;
-
-            proofs.push(main_commitment_proof);
-        }
-
-        Ok((
-            substore_value,
-            MerkleProof {
-                proofs: proofs.clone(),
-            },
-        ))
-    }
-
-    pub fn prefix_version(&self, prefix: &str) -> Result<Option<jmt::Version>> {
-        let Some(config) = self
-            .0
-            .multistore_cache
-            .config
-            .find_substore(prefix.as_bytes())
-        else {
-            anyhow::bail!("rquested a version for a prefix that does not exist (prefix={prefix})")
-        };
-
-        Ok(self.substore_version(&config))
-    }
-
-    /// Returns the root hash of the subtree corresponding to the given prefix.
-    /// If the prefix is empty, the root hash of the main tree is returned.
-    ///
-    /// # Errors
-    /// Returns an error if the supplied prefix does not correspond to a known substore.
-    pub async fn prefix_root_hash(&self, prefix: &str) -> Result<crate::RootHash> {
-        let span = tracing::Span::current();
-        let rocksdb_snapshot = self.0.snapshot.clone();
-        let db = self.0.db.clone();
-
-        let Some(config) = self
-            .0
-            .multistore_cache
-            .config
-            .find_substore(prefix.as_bytes())
-        else {
-            anyhow::bail!("requested a root for a substore that does not exist (prefix={prefix})")
-        };
-
-        let version = self
-            .substore_version(&config)
-            .expect("the substore exists and has been initialized");
-
-        let substore = store::substore::SubstoreSnapshot {
-            config,
-            rocksdb_snapshot,
-            version,
-            db,
-        };
-
-        tracing::debug!(
-            prefix = substore.config.prefix,
-            version = substore.version,
-            "fetching root hash for substore"
-        );
-
-        tokio::task::spawn_blocking(move || span.in_scope(|| substore.root_hash())).await?
-    }
-
-    pub async fn root_hash(&self) -> Result<crate::RootHash> {
-        self.prefix_root_hash("").await
-    }
-
-    pub(crate) fn substore_version(
-        &self,
-        prefix: &Arc<store::substore::SubstoreConfig>,
-    ) -> Option<jmt::Version> {
-        self.0.multistore_cache.get_version(prefix)
-    }
-}
-
-#[async_trait]
-impl StateRead for Snapshot {
-    type GetRawFut = crate::future::SnapshotFuture;
-    type PrefixRawStream =
-        tokio_stream::wrappers::ReceiverStream<anyhow::Result<(String, Vec<u8>)>>;
-    type PrefixKeysStream = tokio_stream::wrappers::ReceiverStream<anyhow::Result<String>>;
-    type NonconsensusPrefixRawStream =
-        tokio_stream::wrappers::ReceiverStream<anyhow::Result<(Vec<u8>, Vec<u8>)>>;
-    type NonconsensusRangeRawStream =
-        tokio_stream::wrappers::ReceiverStream<anyhow::Result<(Vec<u8>, Vec<u8>)>>;
-
-    /// Fetch a key from the JMT.
-    fn get_raw(&self, key: &str) -> Self::GetRawFut {
-        let span = Span::current();
-        let (key, config) = self.0.multistore_cache.config.route_key_str(key);
-
-        let rocksdb_snapshot = self.0.snapshot.clone();
-        let db = self.0.db.clone();
-
-        let version = self
-            .substore_version(&config)
-            .expect("the substore exists and has been initialized");
-
-        let substore = store::substore::SubstoreSnapshot {
-            config,
-            rocksdb_snapshot,
-            version,
-            db,
-        };
-        let key_hash = jmt::KeyHash::with::<sha2::Sha256>(key);
-
-        crate::future::SnapshotFuture(tokio::task::spawn_blocking(move || {
-            span.in_scope(|| {
-                let _start = std::time::Instant::now();
-                let rsp = substore.get_jmt(key_hash);
-                #[cfg(feature = "metrics")]
-                metrics::histogram!(metrics::STORAGE_GET_RAW_DURATION).record(_start.elapsed());
-                rsp
-            })
-        }))
-    }
-
-    /// Fetch a key from nonverifiable storage.
-    fn nonverifiable_get_raw(&self, key: &[u8]) -> Self::GetRawFut {
-        let span = Span::current();
-        let (key, config) = self.0.multistore_cache.config.route_key_bytes(key);
-
-        let rocksdb_snapshot = self.0.snapshot.clone();
-        let db = self.0.db.clone();
-
-        let version = self
-            .substore_version(&config)
-            .expect("the substore exists and has been initialized");
-
-        let substore = store::substore::SubstoreSnapshot {
-            config,
-            rocksdb_snapshot,
-            version,
-            db,
-        };
-        let key: Vec<u8> = key.to_vec();
-
-        crate::future::SnapshotFuture(tokio::task::spawn_blocking(move || {
-            span.in_scope(|| {
-                let _start = std::time::Instant::now();
-
-                let cf_nonverifiable = substore.config.cf_nonverifiable(&substore.db);
-                let rsp = substore
-                    .rocksdb_snapshot
-                    .get_cf(cf_nonverifiable, key)
-                    .map_err(Into::into);
-                #[cfg(feature = "metrics")]
-                metrics::histogram!(metrics::STORAGE_NONCONSENSUS_GET_RAW_DURATION)
-                    .record(_start.elapsed());
-                rsp
-            })
-        }))
-    }
-
-    /// Returns a stream of all key-value pairs with the given prefix.
-    fn prefix_raw(&self, prefix: &str) -> Self::PrefixRawStream {
-        let span = Span::current();
-
-        let rocksdb_snapshot = self.0.snapshot.clone();
-        let db = self.0.db.clone();
-
-        let (prefix_truncated, config) = self.0.multistore_cache.config.match_prefix_str(prefix);
-        tracing::trace!(substore_key = prefix_truncated,  substore_prefix = config.prefix, prefix_supplied = ?prefix, "matched prefix, fetching substore");
-        let substore_prefix = config.prefix.clone();
-
-        let version = self
-            .substore_version(&config)
-            .expect("the substore exists and has been initialized");
-
-        let substore = store::substore::SubstoreSnapshot {
-            config,
-            rocksdb_snapshot,
-            version,
-            db,
-        };
-
-        let mut options = rocksdb::ReadOptions::default();
-        options.set_iterate_range(rocksdb::PrefixRange(prefix_truncated.as_bytes()));
-        let mode = rocksdb::IteratorMode::Start;
-        let (tx_prefix_item, rx_prefix_query) = mpsc::channel(10);
-
-        // Since the JMT keys are hashed, we can't use a prefix iterator directly.
-        // We need to first prefix range the key preimages column family, then use the hashed matches to fetch the values
-        // from the JMT column family.
-        tokio::task::spawn_blocking(move || {
-            span.in_scope(|| {
-                let cf_jmt_keys = substore.config.cf_jmt_keys(&substore.db);
-                let jmt_keys_iterator =
-                    substore
-                        .rocksdb_snapshot
-                        .iterator_cf_opt(cf_jmt_keys, options, mode);
-
-                for tuple in jmt_keys_iterator {
-                    // For each key that matches the prefix, fetch the value from the JMT column family.
-                    let (key_preimage, _) = tuple?;
-                    let substore_key = std::str::from_utf8(key_preimage.as_ref())
-                        .expect("saved jmt keys are utf-8 strings");
-                    let key_hash = jmt::KeyHash::with::<sha2::Sha256>(substore_key.as_bytes());
-
-                    let full_key = if substore_prefix.is_empty() {
-                        substore_key.to_string()
-                    } else {
-                        format!("{substore_prefix}/{substore_key}").to_string()
-                    };
-
-                    let v = substore
-                        .get_jmt(key_hash)?
-                        .expect("keys in jmt_keys should have a corresponding value in jmt");
-
-                    tx_prefix_item.blocking_send(Ok((full_key, v)))?;
-                }
-                anyhow::Ok(())
-            })
-        });
-
-        tokio_stream::wrappers::ReceiverStream::new(rx_prefix_query)
-    }
-
-    // NOTE: this implementation is almost the same as the above, but without
-    // fetching the values. not totally clear if this could be combined, or if that would
-    // be better overall.
-    fn prefix_keys(&self, prefix: &str) -> Self::PrefixKeysStream {
-        let span = Span::current();
-
-        let rocksdb_snapshot = self.0.snapshot.clone();
-        let db = self.0.db.clone();
-
-        let (prefix_truncated, config) = self.0.multistore_cache.config.match_prefix_str(prefix);
-
-        let version = self
-            .substore_version(&config)
-            .expect("the substore exists and has been initialized");
-
-        let substore = store::substore::SubstoreSnapshot {
-            config,
-            rocksdb_snapshot,
-            version,
-            db,
-        };
-
-        let mut options = rocksdb::ReadOptions::default();
-        options.set_iterate_range(rocksdb::PrefixRange(prefix_truncated.as_bytes()));
-        let mode = rocksdb::IteratorMode::Start;
-        let (tx_prefix_keys, rx_prefix_keys) = mpsc::channel(10);
-
-        tokio::task::spawn_blocking(move || {
-            span.in_scope(|| {
-                let cf_jmt_keys = substore.config.cf_jmt_keys(&substore.db);
-                let iter = substore
-                    .rocksdb_snapshot
-                    .iterator_cf_opt(cf_jmt_keys, options, mode);
-
-                let substore_prefix = &substore.config.prefix;
-
-                for key_and_keyhash in iter {
-                    let (raw_preimage, _) = key_and_keyhash?;
-                    let preimage = std::str::from_utf8(raw_preimage.as_ref())
-                        .expect("saved jmt keys are utf-8 strings");
-
-                    let full_key = if substore_prefix.is_empty() {
-                        preimage.to_string()
-                    } else {
-                        format!("{substore_prefix}/{preimage}").to_string()
-                    };
-
-                    tx_prefix_keys.blocking_send(Ok(full_key))?;
-                }
-                anyhow::Ok(())
-            })
-        });
-
-        tokio_stream::wrappers::ReceiverStream::new(rx_prefix_keys)
-    }
-
-    /// Returns a stream of all key-value pairs with the given prefix, from nonverifiable storage.
-    fn nonverifiable_prefix_raw(&self, prefix: &[u8]) -> Self::NonconsensusPrefixRawStream {
-        let span = Span::current();
-        let rocksdb_snapshot = self.0.snapshot.clone();
-        let db = self.0.db.clone();
-
-        let (truncated_prefix, config) = self.0.multistore_cache.config.match_prefix_bytes(prefix);
-        tracing::trace!(substore_key = ?truncated_prefix,  substore_prefix = config.prefix, prefix_supplied = ?prefix, "matched prefix, fetching substore");
-        let version = self
-            .substore_version(&config)
-            .expect("the substore exists and has been initialized");
-
-        let substore = store::substore::SubstoreSnapshot {
-            config,
-            rocksdb_snapshot,
-            version,
-            db,
-        };
-
-        let mut options = rocksdb::ReadOptions::default();
-        options.set_iterate_range(rocksdb::PrefixRange(truncated_prefix));
-        let mode = rocksdb::IteratorMode::Start;
-
-        let (tx_prefix_query, rx_prefix_query) = mpsc::channel(10);
-
-        tokio::task::spawn_blocking(move || {
-            span.in_scope(|| {
-                let cf_nonverifiable = substore.config.cf_nonverifiable(&substore.db);
-                let iter =
-                    substore
-                        .rocksdb_snapshot
-                        .iterator_cf_opt(cf_nonverifiable, options, mode);
-                let substore_prefix = substore.config.prefix.as_bytes().to_vec();
-                for i in iter {
-                    let (boxed_key, boxed_value) = i?;
-                    let key: Vec<u8> = boxed_key.into();
-                    let value: Vec<u8> = boxed_value.into();
-
-                    // Costly to do on every iteration, but this should be dwarfed by the
-                    // context switch to the tokio runtime.
-                    let mut full_key: Vec<u8> = vec![];
-                    if substore_prefix.is_empty() {
-                        full_key.extend(key);
-                    } else {
-                        full_key.extend(substore_prefix.clone());
-                        full_key.extend(iter::once(b'/'));
-                        full_key.extend(key);
-                    }
-
-                    tx_prefix_query.blocking_send(Ok((full_key, value)))?;
-                }
-                anyhow::Ok(())
-            })
-        });
-
-        tokio_stream::wrappers::ReceiverStream::new(rx_prefix_query)
-    }
-
-    /// Returns a stream of all key-value pairs with the given prefix, and range
-    /// from nonverifiable storage.
-    /// **Important**: Only supports range queries over the main store.
-    fn nonverifiable_range_raw(
-        &self,
-        prefix: Option<&[u8]>,
-        range: impl std::ops::RangeBounds<Vec<u8>>,
-    ) -> anyhow::Result<Self::NonconsensusRangeRawStream> {
-        let span = Span::current();
-        let rocksdb_snapshot = self.0.snapshot.clone();
-        let db = self.0.db.clone();
-
-        let (prefix, config) = self
-            .0
-            .multistore_cache
-            .config
-            .route_key_bytes(prefix.unwrap_or_default());
-
-        let version = self
-            .substore_version(&config)
-            .expect("the substore exists and has been initialized");
-
-        let substore = store::substore::SubstoreSnapshot {
-            config,
-            rocksdb_snapshot,
-            version,
-            db,
-        };
-
-        let (_range, (start, end)) = crate::utils::convert_bounds(range)?;
-        let mut options = rocksdb::ReadOptions::default();
-
-        let (start, end) = (start.unwrap_or_default(), end.unwrap_or_default());
-        let end_is_empty = end.is_empty();
-
-        let mut prefix_start = Vec::with_capacity(prefix.len() + start.len());
-        let mut prefix_end = Vec::with_capacity(prefix.len() + end.len());
-
-        prefix_start.extend(prefix);
-        prefix_start.extend(start);
-        prefix_end.extend(prefix);
-        prefix_end.extend(end);
-
-        tracing::debug!(
-            ?prefix_start,
-            ?prefix_end,
-            ?prefix,
-            "nonverifiable_range_raw"
-        );
-
-        options.set_iterate_lower_bound(prefix_start);
-
-        // Our range queries implementation relies on forward iteration, which
-        // means that if the upper key is unbounded and a prefix has been set
-        // we cannot set the upper bound to the prefix. This is because the
-        // prefix is used as a lower bound for the iterator, and the upper bound
-        // is used to stop the iteration.
-        // If we set the upper bound to the prefix, we would get a range consisting of:
-        // ```
-        // "compactblock/001" to "compactblock/"
-        // ```
-        // which would not return anything.
-        if !end_is_empty {
-            options.set_iterate_upper_bound(prefix_end);
-        }
-
-        let mode = rocksdb::IteratorMode::Start;
-        let prefix = prefix.to_vec();
-
-        let (tx, rx) = mpsc::channel::<Result<(Vec<u8>, Vec<u8>)>>(10);
-        tokio::task::spawn_blocking(move || {
-            span.in_scope(|| {
-                let cf_nonverifiable = substore.config.cf_nonverifiable(&substore.db);
-                let iter =
-                    substore
-                        .rocksdb_snapshot
-                        .iterator_cf_opt(cf_nonverifiable, options, mode);
-
-                for i in iter {
-                    let (key, value) = i?;
-
-                    // This is a bit of a hack, but RocksDB doesn't let us express the "prefixed range-queries",
-                    // that we want to support. In particular, we want to be able to do a prefix query that starts
-                    // at a particular key, and does not have an upper bound. Since we can't create an iterator that
-                    // cover this range, we have to filter out the keys that don't match the prefix.
-                    if !prefix.is_empty() && !key.starts_with(&prefix) {
-                        break;
-                    }
-                    tx.blocking_send(Ok((key.into(), value.into())))?;
-                }
-                Ok::<(), anyhow::Error>(())
-            })
-        });
-
-        Ok(tokio_stream::wrappers::ReceiverStream::new(rx))
-    }
-
-    fn object_get<T: Any + Send + Sync + Clone>(&self, _key: &str) -> Option<T> {
-        // No-op -- this will never be called internally, and `Snapshot` is not exposed in public API
-        None
-    }
-
-    fn object_type(&self, _key: &str) -> Option<std::any::TypeId> {
-        // No-op -- this will never be called internally, and `Snapshot` is not exposed in public API
-        None
-    }
-}
-
-impl std::fmt::Debug for Snapshot {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Snapshot")
-            .field("version", &self.0.version)
-            .finish_non_exhaustive()
-    }
-}
diff --git a/crates/cnidarium/src/snapshot/rocks_wrapper.rs b/crates/cnidarium/src/snapshot/rocks_wrapper.rs
deleted file mode 100644
index a7e47fe314..0000000000
--- a/crates/cnidarium/src/snapshot/rocks_wrapper.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use std::fmt::{Debug, Formatter};
-use std::ops::Deref;
-use std::sync::Arc;
-
-/// A wrapper type that acts as a `rocksdb::Snapshot` of an `Arc`'d database
-/// handle.
-///
-/// This works around a limitation of the `rocksdb` API: the `rocksdb::Snapshot`
-/// can only take a borrowed database handle, not an `Arc`'d one, so the
-/// lifetime of the `rocksdb::Snapshot` is bound to the lifetime of the borrowed
-/// handle.  Instead, this wrapper type bundles an `Arc`'d handle together with
-/// the `rocksdb::Snapshot`, so that the database is guaranteed to live at least
-/// as long as any snapshot of it.
-pub struct RocksDbSnapshot {
-    /// The snapshot itself.  It's not really `'static`, so it's on us to ensure
-    /// that the database stays live as long as the snapshot does.
-    inner: rocksdb::Snapshot<'static>,
-    /// The raw pointer form of the Arc<DB> we use to guarantee the database
-    /// lives at least as long as the snapshot.  We create this from the Arc<DB>
-    /// in the constructor, pass it to the snapshot on creation, and then
-    /// convert it back into an Arc in the drop impl to decrement the refcount.
-    ///
-    /// Arc::into_raw consumes the Arc instance but does not decrement the
-    /// refcount.  This means that we cannot accidentally drop the Arc while
-    /// using the raw pointer.  Instead, we must explicitly convert the raw
-    /// pointer back into an Arc when we're finished using it, and only then
-    /// drop it.
-    raw_db: *const rocksdb::DB,
-}
-
-impl Debug for RocksDbSnapshot {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("RocksDbSnapshot").finish()
-    }
-}
-
-// Safety requires that the inner snapshot instance must never live longer than
-// the wrapper.  We're assured that this is the case, because we only return a
-// borrow of the inner snapshot, and because `rocksdb::Snapshot` is neither
-// `Copy` nor `Clone`.
-//
-// We're also reasonably certain that the upstream crate will not add such an
-// implementation in the future, because its drop impl is used to make the FFI
-// call that discards the in-memory snapshot, so it would not be safe to add
-// such an implementation.
-impl Deref for RocksDbSnapshot {
-    type Target = rocksdb::Snapshot<'static>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-impl RocksDbSnapshot {
-    /// Creates a new snapshot of the given `db`.
-    pub fn new(db: Arc<rocksdb::DB>) -> Self {
-        // First, convert the Arc<DB> into a raw pointer.
-        let raw_db = Arc::into_raw(db);
-        // Next, use the raw pointer to construct a &DB instance with a fake
-        // 'static lifetime, and use that instance to construct the inner
-        // Snapshot.
-        let static_db: &'static rocksdb::DB = unsafe { &*raw_db };
-        let inner = rocksdb::Snapshot::new(static_db);
-
-        Self { inner, raw_db }
-    }
-}
-
-impl Drop for RocksDbSnapshot {
-    fn drop(&mut self) {
-        // Now that we know we're finished with the `Snapshot`, we can
-        // reconstruct the `Arc` and drop it, to decrement the DB refcount.
-        unsafe {
-            let db = Arc::from_raw(self.raw_db);
-            std::mem::drop(db);
-        }
-    }
-}
-
-/// The `Send` implementation is safe because the `rocksdb::Snapshot` is `Send`.
-unsafe impl Send for RocksDbSnapshot {}
-/// The `Sync` implementation is safe because the `rocksdb::Snapshot` is `Sync`.
-unsafe impl Sync for RocksDbSnapshot {}
diff --git a/crates/cnidarium/src/snapshot_cache.rs b/crates/cnidarium/src/snapshot_cache.rs
deleted file mode 100644
index 236d40a91a..0000000000
--- a/crates/cnidarium/src/snapshot_cache.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use crate::Snapshot;
-use std::{cmp, collections::VecDeque};
-
-/// A circular cache for storing [`Snapshot`]s.
-///
-/// # Usage
-///
-/// [`Snapshot`]s are inserted in the cache using the [`push`] or [`try_push`]
-/// methods. If the cache is full, the oldest entry will be evicted to make space
-/// for the newer entry.
-///
-/// # Constraints
-///
-/// [`Snapshot`]s must be inserted sequentially relative to their [`jmt::Version`]
-/// numbers, and have consecutive version numbers.
-pub struct SnapshotCache {
-    /// A sequence of increasingly recent [`Snapshot`]s.
-    cache: VecDeque<Snapshot>,
-    /// The max length and capacity of the cache.
-    max_size: usize,
-}
-
-impl SnapshotCache {
-    /// Creates a [`SnapshotCache`] with `max_size` capacity, and inserts an initial `Snapshot` in
-    /// it. If the specified capacity is zero, the cache will default to having size 1.
-    pub fn new(initial: Snapshot, max_size: usize) -> Self {
-        let max_size = cmp::max(max_size, 1);
-        let mut cache = VecDeque::with_capacity(max_size);
-        cache.push_front(initial);
-
-        Self { cache, max_size }
-    }
-
-    /// Attempts to insert a [`Snapshot`] entry into the cache. If the cache is full, the oldest
-    /// entry will be evicted to make space.
-    ///
-    /// [`Snapshot`]s must be inserted sequentially relative to their `jmt::Version`s and have
-    /// consecutive version numbers.
-    ///
-    /// ## Errors
-    ///
-    /// The method will return an error if the supplied `snapshot` has a version number that is:
-    ///
-    /// - stale i.e. older than the latest snapshot
-    ///
-    /// - skipping a version i.e. the difference between their version numbers is greater than 1
-    pub fn try_push(&mut self, snapshot: Snapshot) -> anyhow::Result<()> {
-        let latest_version = self.latest().version();
-        if latest_version.wrapping_add(1) != snapshot.version() {
-            anyhow::bail!("snapshot_cache: trying to insert stale snapshots.");
-        }
-
-        if self.cache.len() >= self.max_size {
-            self.cache.pop_back();
-        }
-
-        self.cache.push_front(snapshot);
-        Ok(())
-    }
-
-    /// Returns the latest inserted `Snapshot`.
-    pub fn latest(&self) -> Snapshot {
-        self.cache
-            .front()
-            .map(Clone::clone)
-            .expect("snapshot_cache cannot be empty")
-    }
-
-    /// Attempts to fetch a [`Snapshot`] with a matching `jmt::Version`, and returns `None` if none
-    /// was found.
-    pub fn get(&self, version: jmt::Version) -> Option<Snapshot> {
-        let latest_version = self.latest().version();
-        // We compute the offset assuming that snapshot entries are cached
-        // such that the delta between entries is always 1.
-        let offset = latest_version.wrapping_sub(version) as usize;
-        self.cache
-            .get(offset)
-            .map(Clone::clone)
-            .filter(|s| s.version() == version)
-    }
-
-    /// Empties the cache.
-    pub fn clear(&mut self) {
-        self.cache.clear();
-    }
-}
-
-#[cfg(test)]
-mod test {
-
-    use crate::snapshot::Snapshot;
-    use crate::snapshot_cache::SnapshotCache;
-    use crate::storage::Storage;
-    use crate::store::multistore::MultistoreCache;
-
-    async fn create_storage_instance() -> Storage {
-        use tempfile::tempdir;
-        // create a storage backend for testing
-        let dir = tempdir().expect("unable to create tempdir");
-        let file_path = dir.path().join("snapshot-cache-testing.db");
-
-        Storage::load(file_path, vec![])
-            .await
-            .expect("unable to load storage")
-    }
-
-    #[tokio::test]
-    /// `SnapshotCache` constructed with zero capacity instead defaults to one.
-    async fn fail_zero_capacity() {
-        let storage = create_storage_instance().await;
-        let db = storage.db();
-        let snapshot = storage.latest_snapshot();
-        let mut cache = SnapshotCache::new(snapshot, 0);
-
-        // Check that the cache has a capacity at least 1
-        assert!(cache.get(u64::MAX).is_some());
-        let new_snapshot = Snapshot::new(db, 0, MultistoreCache::default());
-        cache
-            .try_push(new_snapshot)
-            .expect("should not fail to insert a new entry");
-
-        // Check that the cache has a capacity of exactly 1
-        assert!(cache.get(u64::MAX).is_none());
-        assert!(cache.get(0).is_some());
-    }
-
-    #[tokio::test]
-    /// Fails to insert snapshot entries that are older than the latest'
-    async fn fail_insert_stale_snapshot() {
-        let storage = create_storage_instance().await;
-        let db_handle = storage.db();
-        let snapshot = storage.latest_snapshot();
-        let mut cache = SnapshotCache::new(snapshot, 1);
-        let stale_snapshot = Snapshot::new(db_handle, 1, MultistoreCache::default());
-        cache
-            .try_push(stale_snapshot)
-            .expect_err("should fail to insert a stale entry in the snapshot cache");
-    }
-
-    #[tokio::test]
-    /// Fails to insert snapshot entries that have a version gap.
-    async fn fail_insert_gapped_snapshot() {
-        let storage = create_storage_instance().await;
-        let db_handle = storage.db();
-        let snapshot = Snapshot::new(db_handle.clone(), 0, MultistoreCache::default());
-        let mut cache = SnapshotCache::new(snapshot, 2);
-        let snapshot = Snapshot::new(db_handle, 2, MultistoreCache::default());
-        cache
-            .try_push(snapshot)
-            .expect_err("should fail to insert snapshot with skipped version number");
-    }
-
-    #[tokio::test]
-    /// Checks that we handle pre-genesis `jmt::Version` correctly.
-    async fn cache_manage_pre_genesis() {
-        let storage = create_storage_instance().await;
-        let db_handle = storage.db();
-        let snapshot = storage.latest_snapshot();
-
-        // Create a cache of size 10, populated with one entry with version: u64::MAX
-        let mut cache = SnapshotCache::new(snapshot, 10);
-
-        // Fill the entire cache by inserting 9 more entries.
-        for i in 0..9 {
-            let snapshot = Snapshot::new(db_handle.clone(), i, MultistoreCache::default());
-            cache
-                .try_push(snapshot)
-                .expect("should not fail to insert a new entry");
-        }
-
-        // The cache is full, check that the oldest entry is still in the cache.
-        assert!(cache.get(u64::MAX).is_some());
-
-        // Push another snapshot in the cache, this should cause eviction of the oldest entry
-        // alone.
-        let new_snapshot = Snapshot::new(db_handle, 9, MultistoreCache::default());
-        cache
-            .try_push(new_snapshot)
-            .expect("should not fail to insert a new entry");
-
-        // Check that the pre-genesis entry has been evicted!
-        assert!(cache.get(u64::MAX).is_none());
-
-        // Check that all the other entries are still in the cache.
-        for i in 0..10 {
-            assert!(cache.get(i).is_some());
-        }
-    }
-
-    #[tokio::test]
-    /// Checks that inserting on a full cache exclusively evicts the oldest snapshots.
-    async fn drop_oldest_snapshot() {
-        let storage = create_storage_instance().await;
-        let db_handle = storage.db();
-        let snapshot = Snapshot::new(db_handle.clone(), 0, MultistoreCache::default());
-
-        // Create a cache of size 10, populated with a snapshot at version 0.
-        let mut cache = SnapshotCache::new(snapshot, 10);
-
-        // Saturate the cache by inserting 9 more entries.
-        for i in 1..10 {
-            let snapshot = Snapshot::new(db_handle.clone(), i, MultistoreCache::default());
-            cache
-                .try_push(snapshot)
-                .expect("should be able to insert new entries")
-        }
-
-        // Check that the oldest value is still present:
-        assert!(cache.get(0).is_some());
-
-        // Insert a new value that should overflow the cache.
-        let snapshot = Snapshot::new(db_handle, 10, MultistoreCache::default());
-        cache
-            .try_push(snapshot)
-            .expect("should be able to insert a new entry");
-
-        // Check that the oldest value has been dropped.
-        assert!(cache.get(0).is_none());
-
-        // Check that the front of the cache is the latest inserted snapshot.
-        assert_eq!(cache.latest().version(), 10);
-
-        // Check that all the other snapshots are still present in the cache.
-        for i in 1..11 {
-            assert!(cache.get(i).is_some());
-        }
-    }
-}
diff --git a/crates/cnidarium/src/storage.rs b/crates/cnidarium/src/storage.rs
deleted file mode 100644
index 30ccf67438..0000000000
--- a/crates/cnidarium/src/storage.rs
+++ /dev/null
@@ -1,611 +0,0 @@
-use std::{path::PathBuf, sync::Arc};
-
-use anyhow::{bail, ensure, Result};
-use parking_lot::RwLock;
-use rocksdb::{Options, DB};
-use std::collections::HashMap;
-use tokio::sync::watch;
-use tracing::Span;
-
-use crate::{
-    cache::Cache,
-    snapshot::Snapshot,
-    store::{
-        multistore::{self, MultistoreConfig},
-        substore::{SubstoreConfig, SubstoreSnapshot, SubstoreStorage},
-    },
-};
-use crate::{snapshot_cache::SnapshotCache, StagedWriteBatch, StateDelta};
-
-mod temp;
-pub use temp::TempStorage;
-
-/// A handle for a storage instance, backed by RocksDB.
-///
-/// The handle is cheaply clonable; all clones share the same backing data store.
-#[derive(Clone)]
-pub struct Storage(Arc<Inner>);
-
-impl std::fmt::Debug for Storage {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Storage").finish_non_exhaustive()
-    }
-}
-
-// A private inner element to prevent the `TreeWriter` implementation
-// from leaking outside of this crate.
-struct Inner {
-    dispatcher_tx: watch::Sender<(Snapshot, (jmt::Version, Arc<Cache>))>,
-    snapshot_rx: watch::Receiver<Snapshot>,
-    changes_rx: watch::Receiver<(jmt::Version, Arc<Cache>)>,
-    snapshots: RwLock<SnapshotCache>,
-    multistore_config: MultistoreConfig,
-    /// A handle to the dispatcher task.
-    /// This is used by `Storage::release` to wait for the task to terminate.
-    jh_dispatcher: Option<tokio::task::JoinHandle<()>>,
-    db: Arc<DB>,
-}
-
-impl Storage {
-    /// Loads a storage instance from the given path, initializing it if necessary.
-    pub async fn load(path: PathBuf, default_prefixes: Vec<String>) -> Result<Self> {
-        let span = Span::current();
-        let db_path = path.clone();
-        // initializing main storage instance.
-        let prefixes = tokio::task::spawn_blocking(move || {
-            span.in_scope(|| {
-                let mut opts = Options::default();
-                opts.create_if_missing(true);
-                opts.create_missing_column_families(true);
-                tracing::info!(?path, "opening rocksdb config column");
-
-                // Hack(erwan): RocksDB requires us to specify all the column families
-                // that we want to use upfront. This is problematic when we are initializing
-                // a new database, because the call to `DBCommon<T>::list_cf` will fail
-                // if the database manifest is not found. To work around this, we ignore
-                // the error and assume that the database is empty.
-                // Tracked in: https://github.com/rust-rocksdb/rust-rocksdb/issues/608
-                let mut columns = DB::list_cf(&opts, path.clone()).unwrap_or_default();
-                if columns.is_empty() {
-                    columns.push("config".to_string());
-                }
-
-                let db = DB::open_cf(&opts, path, columns).expect("can open database");
-                let cf_config = db
-                    .cf_handle("config")
-                    .expect("config column family is created if missing");
-                let config_iter = db.iterator_cf(cf_config, rocksdb::IteratorMode::Start);
-                let mut prefixes = Vec::new();
-                tracing::info!("reading prefixes from config column family");
-                for i in config_iter {
-                    let (key, _) = i.expect("can read from iterator");
-                    prefixes.push(String::from_utf8(key.to_vec()).expect("prefix is utf8"));
-                }
-
-                for prefix in default_prefixes {
-                    if !prefixes.contains(&prefix) {
-                        db.put_cf(cf_config, prefix.as_bytes(), b"")
-                            .expect("can write to db");
-                        prefixes.push(prefix);
-                    }
-                }
-
-                std::mem::drop(db);
-                prefixes
-            })
-        })
-        .await?;
-
-        Storage::init(db_path, prefixes).await
-    }
-
-    /// Initializes a new storage instance at the given path. Takes a list of default prefixes
-    /// to initialize the storage configuration with.
-    /// Here is a high-level overview of the initialization process:
-    /// 1. Create a new RocksDB instance at the given path.
-    /// 2. Read the prefix list and create a [`SubstoreConfig`] for each prefix.
-    /// 3. Create a new [`MultistoreConfig`] from supplied prefixes.
-    /// 4. Initialize the substore cache with the latest version of each substore.
-    /// 5. Spawn a dispatcher task that forwards new snapshots to subscribers.
-    pub async fn init(path: PathBuf, prefixes: Vec<String>) -> Result<Self> {
-        let span = Span::current();
-
-        tokio::task
-            ::spawn_blocking(move || {
-                span.in_scope(|| {
-                    let mut substore_configs = Vec::new();
-                    tracing::info!("initializing global store config");
-                    let main_store = Arc::new(SubstoreConfig::new(""));
-                    for substore_prefix in prefixes {
-                        tracing::info!(prefix = ?substore_prefix, "creating substore config for prefix");
-                        if substore_prefix.is_empty() {
-                            bail!("the empty prefix is reserved")
-                        }
-                        substore_configs.push(Arc::new(SubstoreConfig::new(substore_prefix)));
-                    }
-
-                    let multistore_config = MultistoreConfig {
-                        main_store: main_store.clone(),
-                        substores: substore_configs.clone(),
-                    };
-
-                    let mut substore_columns: Vec<&String> = substore_configs
-                        .iter()
-                        .flat_map(|config| config.columns())
-                        .collect();
-                    let mut columns: Vec<&String> = main_store.columns().collect();
-                    columns.append(&mut substore_columns);
-
-                    tracing::info!(?path, "opening rocksdb");
-                    let cf_config_string = "config".to_string();
-                    // RocksDB setup: define options, collect all the columns, and open the database.
-                    // Each substore defines a prefix and its own set of columns.
-                    // See [`crate::store::SubstoreConfig`] for more details.
-                    let mut opts = Options::default();
-                    opts.create_if_missing(true);
-                    opts.create_missing_column_families(true);
-                    columns.push(&cf_config_string);
-
-                    let db = DB::open_cf(&opts, path, columns)?;
-                    let shared_db = Arc::new(db);
-
-                    // Initialize the substore cache with the latest version of each substore.
-                    // Note: for compatibility reasons with Tendermint/CometBFT, we set the "pre-genesis"
-                    // jmt version to be u64::MAX, corresponding to -1 mod 2^64.
-                    let jmt_version = main_store
-                        .latest_version_from_db(&shared_db)?
-                        .unwrap_or(u64::MAX);
-
-                    let mut multistore_cache =
-                        multistore::MultistoreCache::from_config(multistore_config.clone());
-
-                    for substore_config in substore_configs {
-                        let substore_version = substore_config
-                            .latest_version_from_db(&shared_db)?
-                            .unwrap_or(u64::MAX);
-
-                        multistore_cache.set_version(substore_config.clone(), substore_version);
-                        tracing::debug!(
-                            substore_prefix = ?substore_config.prefix,
-                            ?substore_version,
-                            "initializing substore"
-                        );
-                    }
-
-                    multistore_cache.set_version(main_store, jmt_version);
-                    tracing::debug!(?jmt_version, "initializing main store");
-
-                    let latest_snapshot =
-                        Snapshot::new(shared_db.clone(), jmt_version, multistore_cache);
-
-                    // A concurrent-safe ring buffer of the latest 10 snapshots.
-                    let snapshots = RwLock::new(SnapshotCache::new(latest_snapshot.clone(), 10));
-
-                    // Setup a dispatcher task that acts as an intermediary between the storage
-                    // and the rest of the system. Its purpose is to forward new snapshots to
-                    // subscribers.
-                    //
-                    // If we were to send snapshots directly to subscribers, a slow subscriber could
-                    // hold a lock on the watch channel for too long, and block the consensus-critical
-                    // commit logic, which needs to acquire a write lock on the watch channel.
-                    //
-                    // Instead, we "proxy" through a dispatcher task that copies values from one 
-                    // channel to the other, ensuring that if an API consumer misuses the watch 
-                    // channels, it will only affect other subscribers, not the commit logic.
-
-                    let (snapshot_tx, snapshot_rx) = watch::channel(latest_snapshot.clone());
-                    // Note: this will never be seen by consumers, since we mark the current value as seen
-                    // before returning the receiver.
-                    let dummy_cache = (u64::MAX, Arc::new(Cache::default()));
-                    let (changes_tx, changes_rx) = watch::channel(dummy_cache.clone());
-                    let (tx_dispatcher, mut rx_dispatcher) = watch::channel((latest_snapshot, dummy_cache));
-
-                    let jh_dispatcher = tokio::spawn(async move {
-                        tracing::info!("snapshot dispatcher task has started");
-                        // If the sender is dropped, the task will terminate.
-                        while rx_dispatcher.changed().await.is_ok() {
-                            tracing::debug!("dispatcher has received a new snapshot");
-                            let (snapshot, changes) = rx_dispatcher.borrow_and_update().clone();
-                            // [`watch::Sender<T>::send`] only returns an error if there are no
-                            // receivers, so we can safely ignore the result here.
-                            let _ = snapshot_tx.send(snapshot);
-                            let _ = changes_tx.send(changes);
-                        }
-                        tracing::info!("dispatcher task has terminated")
-                    });
-
-                    Ok(Self(Arc::new(Inner {
-                        // We don't need to wrap the task in a `CancelOnDrop<T>` because
-                        // the task will stop when the sender is dropped. However, certain
-                        // test scenarios require us to wait that all resources are released.
-                        jh_dispatcher: Some(jh_dispatcher),
-                        dispatcher_tx: tx_dispatcher,
-                        snapshot_rx,
-                        changes_rx,
-                        multistore_config,
-                        snapshots,
-                        db: shared_db,
-                    })))
-                })
-            })
-            .await?
-    }
-
-    /// Returns the latest version (block height) of the tree recorded by the
-    /// `Storage`.
-    ///
-    /// If the tree is empty and has not been initialized, returns `u64::MAX`.
-    pub fn latest_version(&self) -> jmt::Version {
-        self.latest_snapshot().version()
-    }
-
-    /// Returns a [`watch::Receiver`] that can be used to subscribe to new state versions.
-    pub fn subscribe(&self) -> watch::Receiver<Snapshot> {
-        let mut rx = self.0.snapshot_rx.clone();
-        // Mark the current value as seen, so that the user of the receiver
-        // will only be notified of *subsequent* values.
-        rx.borrow_and_update();
-        rx
-    }
-
-    /// Returns a [`watch::Receiver`] that can be used to subscribe to state changes.
-    pub fn subscribe_changes(&self) -> watch::Receiver<(jmt::Version, Arc<Cache>)> {
-        let mut rx = self.0.changes_rx.clone();
-        // Mark the current value as seen, so that the user of the receiver
-        // will only be notified of *subsequent* values.
-        rx.borrow_and_update();
-        rx
-    }
-
-    /// Returns a new [`Snapshot`] on top of the latest version of the tree.
-    pub fn latest_snapshot(&self) -> Snapshot {
-        self.0.snapshots.read().latest()
-    }
-
-    /// Fetches the [`Snapshot`] corresponding to the supplied `jmt::Version` from
-    /// the [`SnapshotCache`]. Returns `None` if no match was found.
-    pub fn snapshot(&self, version: jmt::Version) -> Option<Snapshot> {
-        self.0.snapshots.read().get(version)
-    }
-
-    /// Prepares a commit for the provided [`StateDelta`], returning a [`StagedWriteBatch`].
-    /// The batch can be committed to the database using the [`Storage::commit_batch`] method.
-    pub async fn prepare_commit(&self, delta: StateDelta<Snapshot>) -> Result<StagedWriteBatch> {
-        // Extract the snapshot and the changes from the state delta
-        let (snapshot, changes) = delta.flatten();
-        let prev_snapshot_version = snapshot.version();
-
-        // We use wrapping_add here so that we can write `new_version = 0` by
-        // overflowing `PRE_GENESIS_VERSION`.
-        let prev_storage_version = self.latest_version();
-        let next_storage_version = prev_storage_version.wrapping_add(1);
-        tracing::debug!(prev_storage_version, next_storage_version);
-
-        ensure!(
-            prev_storage_version == prev_snapshot_version,
-            "trying to prepare a commit for a delta forked from version {}, but the latest version is {}",
-            prev_snapshot_version,
-            prev_storage_version
-        );
-
-        self.prepare_commit_inner(snapshot, changes, next_storage_version, false)
-            .await
-    }
-
-    async fn prepare_commit_inner(
-        &self,
-        snapshot: Snapshot,
-        cache: Cache,
-        version: jmt::Version,
-        perform_migration: bool,
-    ) -> Result<StagedWriteBatch> {
-        tracing::debug!(new_jmt_version = ?version, "preparing to commit state delta");
-        // Save a copy of the changes to send to subscribers later.
-        let changes = Arc::new(cache.clone_changes());
-
-        let mut changes_by_substore = cache.shard_by_prefix(&self.0.multistore_config);
-        #[allow(clippy::disallowed_types)]
-        let mut substore_roots = HashMap::new();
-        let mut multistore_versions =
-            multistore::MultistoreCache::from_config(self.0.multistore_config.clone());
-
-        let db = self.0.db.clone();
-        let rocksdb_snapshot = snapshot.0.snapshot.clone();
-
-        let mut new_versions = vec![];
-
-        // We use a single write batch to commit all the substores at once. Each task will append
-        // its own changes to the batch, and we will commit it at the end.
-        let mut write_batch = rocksdb::WriteBatch::default();
-
-        //  Note(erwan): Here, we spawn a commit task for each substore.
-        //  The substore keyspaces are disjoint, so conceptually it is
-        //  fine to rewrite it using a [`tokio::task::JoinSet`].
-        //  The reason this isn't done is because `rocksdb::WriteBatch`
-        //  is _not_ thread-safe.
-        //
-        //  This means that to spin-up N tasks, we would need to use a
-        //  single batch wrapped in a mutex, or use N batches, and find
-        //  a way to commit to them atomically. This isn't supported by
-        //  RocksDB which leaves one option: to iterate over each entry
-        //  in each batch, and merge them together. At this point, this
-        //  is probably not worth it.
-        //
-        //  Another option is to trade atomicity for parallelism by producing
-        //  N batches, and committing them in distinct atomic writes. This is
-        //  potentially faster, but it is also more dangerous, because if one
-        //  of the writes fails, we are left with a partially committed state.
-        //
-        //  The current implementation leans on the fact that the number of
-        //  substores is small, and that the synchronization overhead of a joinset
-        //  would exceed its benefits. This works well for now.
-        for config in self.0.multistore_config.iter() {
-            tracing::debug!(substore_prefix = ?config.prefix, "processing substore");
-            // If the substore is empty, we need to fetch its initialized version from the cache.
-            let old_substore_version = config
-                .latest_version_from_snapshot(&db, &rocksdb_snapshot)?
-                .unwrap_or_else(|| {
-                    tracing::debug!("substore is empty, fetching initialized version from cache");
-                    snapshot
-                        .substore_version(config)
-                        .expect("prefix should be initialized")
-                });
-
-            let Some(changeset) = changes_by_substore.remove(config) else {
-                tracing::debug!(prefix = config.prefix, "no changes for substore, skipping");
-                multistore_versions.set_version(config.clone(), old_substore_version);
-                continue;
-            };
-
-            let new_version = if perform_migration {
-                old_substore_version
-            } else {
-                old_substore_version.wrapping_add(1)
-            };
-            new_versions.push(new_version);
-            let substore_snapshot = SubstoreSnapshot {
-                config: config.clone(),
-                rocksdb_snapshot: rocksdb_snapshot.clone(),
-                version: new_version,
-                db: db.clone(),
-            };
-
-            let substore_storage = SubstoreStorage { substore_snapshot };
-
-            // Commit the substore and collect its root hash
-            let (root_hash, substore_batch) = substore_storage
-                .commit(changeset, write_batch, new_version, perform_migration)
-                .await?;
-            write_batch = substore_batch;
-
-            tracing::debug!(
-                ?root_hash,
-                prefix = config.prefix,
-                ?version,
-                "added substore to write batch"
-            );
-            substore_roots.insert(config.clone(), (root_hash, new_version));
-
-            tracing::debug!(
-                ?root_hash,
-                prefix = ?config.prefix,
-                ?new_version,
-                "updating substore version"
-            );
-            multistore_versions.set_version(config.clone(), new_version);
-        }
-
-        // Add substore roots to the main store changeset
-        let main_store_config = self.0.multistore_config.main_store.clone();
-        let mut main_store_changes = changes_by_substore
-            .remove(&main_store_config)
-            .unwrap_or_else(|| {
-                tracing::debug!("no changes for main store, creating empty changeset");
-                Cache::default()
-            });
-
-        for (config, (root_hash, _)) in substore_roots.iter() {
-            main_store_changes
-                .unwritten_changes
-                .insert(config.prefix.to_string(), Some(root_hash.0.to_vec()));
-        }
-
-        // Commit the main store and collect the global root hash
-        let main_store_snapshot = SubstoreSnapshot {
-            config: main_store_config.clone(),
-            rocksdb_snapshot: snapshot.0.snapshot.clone(),
-            version,
-            db: self.0.db.clone(),
-        };
-
-        let main_store_storage = SubstoreStorage {
-            substore_snapshot: main_store_snapshot,
-        };
-
-        let (global_root_hash, write_batch) = main_store_storage
-            .commit(main_store_changes, write_batch, version, perform_migration)
-            .await?;
-        tracing::debug!(
-            ?global_root_hash,
-            ?version,
-            "added main store to write batch"
-        );
-
-        tracing::debug!(?global_root_hash, version = ?version, "updating main store version");
-        let main_store_config = self.0.multistore_config.main_store.clone();
-        multistore_versions.set_version(main_store_config, version);
-
-        Ok(StagedWriteBatch {
-            write_batch,
-            version,
-            multistore_versions,
-            root_hash: global_root_hash,
-            substore_roots,
-            perform_migration,
-            changes,
-        })
-    }
-
-    /// Commits the provided [`StateDelta`] to persistent storage as the latest
-    /// version of the chain state.
-    pub async fn commit(&self, delta: StateDelta<Snapshot>) -> Result<crate::RootHash> {
-        let batch = self.prepare_commit(delta).await?;
-        self.commit_batch(batch)
-    }
-
-    /// Commits the supplied [`StagedWriteBatch`] to persistent storage.
-    ///
-    /// # Migrations
-    /// In the case of chain state migrations we need to commit the new state
-    /// without incrementing the version. If `perform_migration` is `true` the
-    /// snapshot will _not_ be written to the snapshot cache, and no subscribers
-    /// will be notified. Substore versions will not be updated.
-    pub fn commit_batch(&self, batch: StagedWriteBatch) -> Result<crate::RootHash> {
-        let StagedWriteBatch {
-            write_batch,
-            version,
-            multistore_versions,
-            root_hash: global_root_hash,
-            substore_roots,
-            perform_migration,
-            changes,
-        } = batch;
-
-        let db = self.0.db.clone();
-
-        // check that the version of the batch being committed is the correct next version
-        let old_version = self.latest_version();
-        let expected_new_version = if perform_migration {
-            old_version
-        } else {
-            old_version.wrapping_add(1)
-        };
-
-        ensure!(
-            expected_new_version == version,
-            "new version mismatch: expected {} but got {}",
-            expected_new_version,
-            version
-        );
-
-        // also check that each of the substore versions are the correct next version
-        let snapshot = self.latest_snapshot();
-
-        // Warning: we MUST check version coherence for **every** substore.
-        // These checks are a second line of defense. They must consider
-        // the case when two deltas effect distinct substores.
-        //
-        // version: (m,   ss_1, ss_2)
-        // D_0:     (_,      1,    0) <- initial state
-        // D_1:     (A,      1,    1) <- multiwrite to ss_1 AND ss_2
-        // D_1*:    (A,      1,    0) <- isolate write to ss_1
-        //
-        // A comprehensive check lets us catch the stale write D_1* even if
-        // locally it does not directly effect the second substore at all.
-        // And even if the main version check passes (spuriously, or because of
-        // a migration).
-        for (substore_config, new_version) in &multistore_versions.substores {
-            if substore_config.prefix.is_empty() {
-                // this is the main store, ignore
-                continue;
-            }
-
-            let old_substore_version = snapshot
-                .substore_version(substore_config)
-                .expect("substores must be initialized at startup");
-
-            // if the substore exists in `substore_roots`, there have been updates to the substore.
-            // if `perform_migration` is false and there are updates, the next version should be previous + 1.
-            // otherwise, the version should remain the same.
-            let expected_substore_version =
-                if substore_roots.get(substore_config).is_some() && !perform_migration {
-                    old_substore_version.wrapping_add(1)
-                } else {
-                    old_substore_version
-                };
-
-            ensure!(
-                expected_substore_version == *new_version,
-                "substore new version mismatch for substore with prefix {}: expected {} but got {}",
-                substore_config.prefix,
-                expected_substore_version,
-                new_version
-            );
-        }
-
-        tracing::debug!(new_jmt_version = ?batch.version, "committing batch to db");
-
-        db.write(write_batch).expect("can write to db");
-        tracing::debug!(
-            ?global_root_hash,
-            ?version,
-            "committed main store and substores to db"
-        );
-
-        // If we're not performing a migration, we should update the snapshot cache
-        if !perform_migration {
-            tracing::debug!("updating snapshot cache");
-
-            let latest_snapshot = Snapshot::new(db.clone(), version, multistore_versions);
-            // Obtain a write lock to the snapshot cache, and push the latest snapshot
-            // available. The lock guard is implicitly dropped immediately.
-            self.0
-                .snapshots
-                .write()
-                .try_push(latest_snapshot.clone())
-                .expect("should process snapshots with consecutive jmt versions");
-
-            tracing::debug!(?version, "dispatching snapshot");
-
-            // Send fails if the channel is closed (i.e., if there are no receivers);
-            // in this case, we should ignore the error, we have no one to notify.
-            let _ = self
-                .0
-                .dispatcher_tx
-                .send((latest_snapshot, (version, changes)));
-        } else {
-            tracing::debug!("skipping snapshot cache update");
-        }
-
-        Ok(global_root_hash)
-    }
-
-    #[cfg(feature = "migration")]
-    /// Commit the provided [`StateDelta`] to persistent storage without increasing the version
-    /// of the chain state, and skips the snapshot cache update.
-    pub async fn commit_in_place(&self, delta: StateDelta<Snapshot>) -> Result<crate::RootHash> {
-        let (snapshot, changes) = delta.flatten();
-        let old_version = self.latest_version();
-        let batch = self
-            .prepare_commit_inner(snapshot, changes, old_version, true)
-            .await?;
-        self.commit_batch(batch)
-    }
-
-    /// Returns the internal handle to RocksDB, this is useful to test adjacent storage crates.
-    #[cfg(test)]
-    pub(crate) fn db(&self) -> Arc<DB> {
-        self.0.db.clone()
-    }
-
-    /// Shuts down the database and the dispatcher task, and waits for all resources to be reclaimed.
-    /// Panics if there are still outstanding references to the `Inner` storage.
-    pub async fn release(mut self) {
-        if let Some(inner) = Arc::get_mut(&mut self.0) {
-            inner.shutdown().await;
-            inner.snapshots.write().clear();
-            // `Inner` is dropped once the call completes.
-        } else {
-            panic!("Unable to get mutable reference to Inner");
-        }
-    }
-}
-
-impl Inner {
-    pub(crate) async fn shutdown(&mut self) {
-        if let Some(jh) = self.jh_dispatcher.take() {
-            jh.abort();
-            let _ = jh.await;
-        }
-    }
-}
diff --git a/crates/cnidarium/src/storage/temp.rs b/crates/cnidarium/src/storage/temp.rs
deleted file mode 100644
index e82368c899..0000000000
--- a/crates/cnidarium/src/storage/temp.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use crate::Storage;
-use std::ops::Deref;
-use tempfile::TempDir;
-
-/// A [`Storage`] instance backed by a [`tempfile::TempDir`] for testing.
-///
-/// The `TempDir` handle is bundled into the `TempStorage`, so the temporary
-/// directory is cleaned up when the `TempStorage` instance is dropped.
-pub struct TempStorage {
-    inner: Storage,
-    _dir: TempDir,
-}
-
-impl Deref for TempStorage {
-    type Target = Storage;
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-impl AsRef<Storage> for TempStorage {
-    fn as_ref(&self) -> &Storage {
-        &self.inner
-    }
-}
-
-impl TempStorage {
-    pub async fn new() -> anyhow::Result<Self> {
-        let dir = tempfile::tempdir()?;
-        let db_filepath = dir.path().join("storage.db");
-        let inner = Storage::load(db_filepath.clone(), vec![]).await?;
-
-        Ok(TempStorage { inner, _dir: dir })
-    }
-
-    pub async fn new_with_prefixes(prefixes: Vec<String>) -> anyhow::Result<Self> {
-        let dir = tempfile::tempdir()?;
-        let db_filepath = dir.path().join("storage.db");
-        let inner = Storage::load(db_filepath.clone(), prefixes).await?;
-
-        Ok(TempStorage { inner, _dir: dir })
-    }
-}
diff --git a/crates/cnidarium/src/store.rs b/crates/cnidarium/src/store.rs
deleted file mode 100644
index 3e703f1f05..0000000000
--- a/crates/cnidarium/src/store.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub(crate) mod multistore;
-pub(crate) mod substore;
diff --git a/crates/cnidarium/src/store/multistore.rs b/crates/cnidarium/src/store/multistore.rs
deleted file mode 100644
index b52ede0dc3..0000000000
--- a/crates/cnidarium/src/store/multistore.rs
+++ /dev/null
@@ -1,233 +0,0 @@
-use std::{fmt::Display, sync::Arc};
-
-use super::substore::SubstoreConfig;
-
-/// A collection of substore, each with a unique prefix.
-#[derive(Debug, Clone)]
-pub struct MultistoreConfig {
-    pub main_store: Arc<SubstoreConfig>,
-    pub substores: Vec<Arc<SubstoreConfig>>,
-}
-
-impl MultistoreConfig {
-    pub fn iter(&self) -> impl Iterator<Item = &Arc<SubstoreConfig>> {
-        self.substores.iter()
-    }
-
-    /// Returns the substore matching the key's prefix, return `None` otherwise.
-    pub fn find_substore(&self, key: &[u8]) -> Option<Arc<SubstoreConfig>> {
-        if key.is_empty() {
-            return Some(self.main_store.clone());
-        }
-
-        // Note: This is a linear search, but the number of substores is small.
-        self.substores
-            .iter()
-            .find(|s| key.starts_with(s.prefix.as_bytes()))
-            .cloned()
-    }
-
-    /// Route a key to a substore, and return the truncated key and the corresponding `SubstoreConfig`.
-    ///
-    /// This method is used for ordinary key-value operations.
-    ///
-    /// Note: since this method implements the routing logic for the multistore,
-    /// callers might prefer [`MultistoreConfig::match_prefix_str`] if they don't
-    /// need to route the key.
-    ///
-    /// # Routing
-    /// + If the key is a total match for the prefix, the **main store** is returned.
-    /// + If the key is not a total match for the prefix, the prefix is removed from  
-    ///   the key and the key is routed to the substore matching the prefix.
-    /// + If the key does not match any prefix, the key is routed to the **main store**.
-    /// + If a delimiter is prefixing the key, it is removed.
-    ///
-    /// # Examples
-    /// `prefix_a/key` -> `key` in `substore_a`
-    /// `prefix_akey` -> `prefix_akey` in `main_store
-    /// `prefix_a` -> `prefix_a` in `main_store`
-    /// `prefix_a/` -> `prefix_a/` in `main_store
-    /// `nonexistent_prefix` -> `nonexistent_prefix` in `main_store`
-    pub fn route_key_str<'a>(&self, key: &'a str) -> (&'a str, Arc<SubstoreConfig>) {
-        let config = self
-            .find_substore(key.as_bytes())
-            .unwrap_or_else(|| self.main_store.clone());
-
-        // If the key is a total match, we want to return the key bound to the
-        // main store. This is where the root hash of the prefix tree is located.
-        if key == config.prefix {
-            return (key, self.main_store.clone());
-        }
-
-        let truncated_key = key
-            .strip_prefix(&config.prefix)
-            .expect("key has the prefix of the matched substore");
-
-        // If the key does not contain a delimiter, we return the original key
-        // routed to the main store. This is because we do not want to allow
-        // collisions e.g. `prefix_a/key` and `prefix_akey`.
-        let Some(matching_key) = truncated_key.strip_prefix('/') else {
-            return (key, self.main_store.clone());
-        };
-
-        // If the matching key is empty, we return the original key routed to
-        // the main store. This is because we do not want to allow empty keys
-        // in the substore.
-        if matching_key.is_empty() {
-            (key, self.main_store.clone())
-        } else {
-            (matching_key, config)
-        }
-    }
-
-    /// Route a key to a substore, and return the truncated key and the corresponding `SubstoreConfig`.
-    ///
-    /// This method is used for ordinary key-value operations.
-    ///
-    /// Note: since this method implements the routing logic for the multistore,
-    /// callers might prefer [`MultistoreConfig::match_prefix_bytes`] if they don't
-    /// need to route the key.
-    ///
-    /// # Routing
-    /// + If the key is a total match for the prefix, the **main store** is returned.
-    /// + If the key is not a total match for the prefix, the prefix is removed from  
-    ///   the key and the key is routed to the substore matching the prefix.
-    /// + If the key does not match any prefix, the key is routed to the **main store**.
-    /// + If a delimiter is prefixing the key, it is removed.
-    ///
-    /// # Examples
-    /// `prefix_a/key` -> `key` in `substore_a`
-    /// `prefix_a` -> `prefix_a` in `main_store`
-    /// `prefix_a/` -> `prefix_a/` in `main_store`
-    /// `nonexistent_prefix` -> `nonexistent_prefix` in `main_store`
-    pub fn route_key_bytes<'a>(&self, key: &'a [u8]) -> (&'a [u8], Arc<SubstoreConfig>) {
-        let config = self
-            .find_substore(key)
-            .unwrap_or_else(|| self.main_store.clone());
-
-        // If the key is a total match for the prefix, we return the original key
-        // routed to the main store. This is where subtree root hashes are stored.
-        if key == config.prefix.as_bytes() {
-            return (key, self.main_store.clone());
-        }
-
-        let truncated_key = key
-            .strip_prefix(config.prefix.as_bytes())
-            .expect("key has the prefix of the matched substore");
-
-        // If the key does not contain a delimiter, we return the original key
-        // routed to the main store. This is because we do not want to allow
-        // collisions e.g. `prefix_a/key` and `prefix_akey`.
-        let Some(matching_key) = truncated_key.strip_prefix(b"/") else {
-            return (key, self.main_store.clone());
-        };
-
-        // If the matching key is empty, we return the original key routed to
-        // the main store. This is because we do not want to allow empty keys
-        // in the substore.
-        if matching_key.is_empty() {
-            (key, self.main_store.clone())
-        } else {
-            (matching_key, config)
-        }
-    }
-
-    /// Returns the truncated prefix and the corresponding `SubstoreConfig`.
-    ///
-    /// This method is used to implement prefix iteration.
-    ///
-    /// Unlike [`MultistoreConfig::route_key_str`], this method does not do any routing.
-    /// It simply finds the substore matching the prefix, strip the prefix and delimiter,
-    /// and returns the truncated prefix and the corresponding `SubstoreConfig`.
-    ///
-    /// # Examples
-    /// `prefix_a/key` -> `key` in `substore_a`
-    /// `prefix_a` -> "" in `substore_a`
-    /// `prefix_a/` -> "" in `substore_a`
-    /// `nonexistent_prefix` -> "" in `main_store`
-    pub fn match_prefix_str<'a>(&self, prefix: &'a str) -> (&'a str, Arc<SubstoreConfig>) {
-        let config = self
-            .find_substore(prefix.as_bytes())
-            .unwrap_or_else(|| self.main_store.clone());
-
-        let truncated_prefix = prefix
-            .strip_prefix(&config.prefix)
-            .expect("key has the prefix of the matched substore");
-
-        let truncated_prefix = truncated_prefix
-            .strip_prefix('/')
-            .unwrap_or(truncated_prefix);
-        (truncated_prefix, config)
-    }
-
-    /// Returns the truncated prefix and the corresponding `SubstoreConfig`.
-    ///
-    /// Unlike [`MultistoreConfig::route_key_str`], this method does not do any routing.
-    /// It simply finds the substore matching the prefix, strip the prefix and delimiter,
-    /// and returns the truncated prefix and the corresponding `SubstoreConfig`.
-    ///
-    /// This method is used to implement prefix iteration.
-    ///
-    /// # Examples
-    /// `prefix_a/key` -> `key` in `substore_a`
-    /// `prefix_a` -> "" in `substore_a`
-    /// `prefix_a/` -> "" in `substore_a`
-    /// `nonexistent_prefix` -> "" in `main_store`
-    pub fn match_prefix_bytes<'a>(&self, prefix: &'a [u8]) -> (&'a [u8], Arc<SubstoreConfig>) {
-        let config = self
-            .find_substore(prefix)
-            .unwrap_or_else(|| self.main_store.clone());
-
-        let truncated_prefix = prefix
-            .strip_prefix(config.prefix.as_bytes())
-            .expect("key has the prefix of the matched substore");
-
-        let truncated_prefix = truncated_prefix
-            .strip_prefix(b"/")
-            .unwrap_or(truncated_prefix);
-        (truncated_prefix, config)
-    }
-}
-
-impl Default for MultistoreConfig {
-    fn default() -> Self {
-        Self {
-            main_store: Arc::new(SubstoreConfig::new("")),
-            substores: vec![],
-        }
-    }
-}
-
-/// Tracks the latest version of each substore, and wraps a `MultistoreConfig`.
-#[derive(Default, Debug)]
-pub struct MultistoreCache {
-    pub config: MultistoreConfig,
-    pub substores: std::collections::BTreeMap<Arc<SubstoreConfig>, jmt::Version>,
-}
-
-impl Display for MultistoreCache {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let mut s = String::new();
-        for (substore, version) in &self.substores {
-            s.push_str(&format!("{}: {}\n", substore.prefix, version));
-        }
-        write!(f, "{}", s)
-    }
-}
-
-impl MultistoreCache {
-    pub fn from_config(config: MultistoreConfig) -> Self {
-        Self {
-            config,
-            substores: std::collections::BTreeMap::new(),
-        }
-    }
-
-    pub fn set_version(&mut self, substore: Arc<SubstoreConfig>, version: jmt::Version) {
-        self.substores.insert(substore, version);
-    }
-
-    pub fn get_version(&self, substore: &Arc<SubstoreConfig>) -> Option<jmt::Version> {
-        self.substores.get(substore).cloned()
-    }
-}
diff --git a/crates/cnidarium/src/store/substore.rs b/crates/cnidarium/src/store/substore.rs
deleted file mode 100644
index 876a94b744..0000000000
--- a/crates/cnidarium/src/store/substore.rs
+++ /dev/null
@@ -1,546 +0,0 @@
-use std::{
-    fmt::{Display, Formatter},
-    sync::Arc,
-};
-
-use anyhow::Result;
-use borsh::BorshDeserialize;
-use jmt::{
-    storage::{HasPreimage, LeafNode, Node, NodeKey, TreeReader},
-    KeyHash, RootHash,
-};
-use rocksdb::{ColumnFamily, IteratorMode, ReadOptions};
-use tracing::Span;
-
-use crate::{snapshot::RocksDbSnapshot, Cache};
-
-use jmt::storage::TreeWriter;
-
-/// Specifies the configuration of a substore, which is a prefixed subset of
-/// the main store with its own merkle tree, nonverifiable data, preimage index, etc.
-#[derive(Debug, Eq, PartialEq, PartialOrd, Ord, Hash)]
-pub struct SubstoreConfig {
-    /// The prefix of the substore. If empty, it is the root-level store config.
-    pub prefix: String,
-    /// The prefix of the substore including the trailing slash.
-    pub prefix_with_delimiter: String,
-    /// name: "substore-{prefix}-jmt"
-    /// role: persists the logical structure of the JMT
-    /// maps: `storage::DbNodeKey` to `jmt::Node`
-    // note: `DbNodeKey` is a newtype around `NodeKey` that serialize the key
-    // so that it maps to a lexicographical ordering with ascending jmt::Version.
-    cf_jmt: String,
-    /// name: "susbstore-{prefix}-jmt-keys"
-    /// role: JMT key index.
-    /// maps: key preimages to their keyhash.
-    cf_jmt_keys: String,
-    /// name: "substore-{prefix}-jmt-values"
-    /// role: stores the actual values that JMT leaves point to.
-    /// maps: KeyHash || BE(version) to an `Option<Vec<u8>>`
-    cf_jmt_values: String,
-    /// name: "substore-{prefix}-jmt-keys-by-keyhash"
-    /// role: index JMT keys by their keyhash.
-    /// maps: keyhashes to their preimage.
-    cf_jmt_keys_by_keyhash: String,
-    /// name: "substore-{prefix}-nonverifiable"
-    /// role: auxiliary data that is not part of our merkle tree, and thus not strictly
-    /// part of consensus.
-    /// maps: arbitrary keys to arbitrary values.
-    cf_nonverifiable: String,
-}
-
-impl SubstoreConfig {
-    pub fn new(prefix: impl ToString) -> Self {
-        let prefix = prefix.to_string();
-        Self {
-            cf_jmt: format!("substore-{}-jmt", prefix),
-            cf_jmt_keys: format!("substore-{}-jmt-keys", prefix),
-            cf_jmt_values: format!("substore-{}-jmt-values", prefix),
-            cf_jmt_keys_by_keyhash: format!("substore-{}-jmt-keys-by-keyhash", prefix),
-            cf_nonverifiable: format!("substore-{}-nonverifiable", prefix),
-            prefix_with_delimiter: format!("{}/", prefix),
-            prefix,
-        }
-    }
-
-    /// Returns an iterator over all column families in this substore.
-    /// Note(erwan): This is verbose, but very lightweight.
-    pub fn columns(&self) -> impl Iterator<Item = &String> {
-        std::iter::once(&self.cf_jmt)
-            .chain(std::iter::once(&self.cf_jmt_keys))
-            .chain(std::iter::once(&self.cf_jmt_values))
-            .chain(std::iter::once(&self.cf_jmt_keys_by_keyhash))
-            .chain(std::iter::once(&self.cf_nonverifiable))
-    }
-
-    pub fn cf_jmt<'s>(&self, db_handle: &'s Arc<rocksdb::DB>) -> &'s ColumnFamily {
-        let column = self.cf_jmt.as_str();
-        db_handle.cf_handle(column).unwrap_or_else(|| {
-            panic!(
-                "jmt column family not found for prefix: {}, substore: {}",
-                column, self.prefix
-            )
-        })
-    }
-
-    pub fn cf_jmt_values<'s>(&self, db_handle: &'s Arc<rocksdb::DB>) -> &'s ColumnFamily {
-        let column = self.cf_jmt_values.as_str();
-        db_handle.cf_handle(column).unwrap_or_else(|| {
-            panic!(
-                "jmt-values column family not found for prefix: {}, substore: {}",
-                column, self.prefix
-            )
-        })
-    }
-
-    pub fn cf_jmt_keys_by_keyhash<'s>(&self, db_handle: &'s Arc<rocksdb::DB>) -> &'s ColumnFamily {
-        let column = self.cf_jmt_keys_by_keyhash.as_str();
-        db_handle.cf_handle(column).unwrap_or_else(|| {
-            panic!(
-                "jmt-keys-by-keyhash column family not found for prefix: {}, substore: {}",
-                column, self.prefix
-            )
-        })
-    }
-
-    pub fn cf_jmt_keys<'s>(&self, db_handle: &'s Arc<rocksdb::DB>) -> &'s ColumnFamily {
-        let column = self.cf_jmt_keys.as_str();
-        db_handle.cf_handle(column).unwrap_or_else(|| {
-            panic!(
-                "jmt-keys column family not found for prefix: {}, substore: {}",
-                column, self.prefix
-            )
-        })
-    }
-
-    pub fn cf_nonverifiable<'s>(&self, db_handle: &'s Arc<rocksdb::DB>) -> &'s ColumnFamily {
-        let column = self.cf_nonverifiable.as_str();
-        db_handle.cf_handle(column).unwrap_or_else(|| {
-            panic!(
-                "nonverifiable column family not found for prefix: {}, substore: {}",
-                column, self.prefix
-            )
-        })
-    }
-
-    pub fn latest_version_from_db(
-        &self,
-        db_handle: &Arc<rocksdb::DB>,
-    ) -> Result<Option<jmt::Version>> {
-        Ok(self
-            .get_rightmost_leaf_from_db(db_handle)?
-            .map(|(node_key, _)| node_key.version()))
-    }
-
-    pub fn latest_version_from_snapshot(
-        &self,
-        db_handle: &Arc<rocksdb::DB>,
-        snapshot: &RocksDbSnapshot,
-    ) -> Result<Option<jmt::Version>> {
-        Ok(self
-            .get_rightmost_leaf_from_snapshot(db_handle, snapshot)?
-            .map(|(node_key, _)| node_key.version()))
-    }
-
-    // TODO(erwan): having two different implementations of this is a bit weird and should
-    // be refactored, or remodeled. The DB version is only used during initialization, before
-    // a `Snapshot` is available.
-    fn get_rightmost_leaf_from_db(
-        &self,
-        db_handle: &Arc<rocksdb::DB>,
-    ) -> Result<Option<(NodeKey, LeafNode)>> {
-        let cf_jmt = self.cf_jmt(db_handle);
-        let mut iter = db_handle.raw_iterator_cf(cf_jmt);
-        iter.seek_to_last();
-
-        if iter.valid() {
-            let node_key =
-                DbNodeKey::decode(iter.key().expect("all DB entries should have a key"))?
-                    .into_inner();
-            let node =
-                Node::try_from_slice(iter.value().expect("all DB entries should have a value"))?;
-
-            if let Node::Leaf(leaf_node) = node {
-                return Ok(Some((node_key, leaf_node)));
-            }
-        } else {
-            // There are no keys in the database
-        }
-
-        Ok(None)
-    }
-
-    fn get_rightmost_leaf_from_snapshot(
-        &self,
-        db_handle: &Arc<rocksdb::DB>,
-        snapshot: &RocksDbSnapshot,
-    ) -> Result<Option<(NodeKey, LeafNode)>> {
-        let cf_jmt = self.cf_jmt(db_handle);
-        let mut iter = snapshot.iterator_cf(cf_jmt, IteratorMode::End);
-        let Some((raw_key, raw_value)) = iter.next().transpose()? else {
-            return Ok(None);
-        };
-
-        let node_key = DbNodeKey::decode(&raw_key)?.into_inner();
-        let Node::Leaf(leaf) = Node::try_from_slice(&raw_value)? else {
-            return Ok(None);
-        };
-        Ok(Some((node_key, leaf)))
-    }
-}
-
-impl Display for SubstoreConfig {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "SubstoreConfig(prefix={})", self.prefix)
-    }
-}
-
-/// A read-only view into a substore at a specific state version.
-///
-/// A [`SubstoreSnapshot`] is lightweight and cheap to create, it can be
-/// instantiated on-demand when a read-only view of a substore's state is
-/// needed.
-pub struct SubstoreSnapshot {
-    pub(crate) config: Arc<SubstoreConfig>,
-    pub(crate) rocksdb_snapshot: Arc<RocksDbSnapshot>,
-    pub(crate) version: jmt::Version,
-    pub(crate) db: Arc<rocksdb::DB>,
-}
-
-impl SubstoreSnapshot {
-    pub fn root_hash(&self) -> Result<crate::RootHash> {
-        let version = self.version();
-        let tree = jmt::Sha256Jmt::new(self);
-        Ok(tree
-            .get_root_hash_option(version)?
-            .unwrap_or(jmt::RootHash([0; 32])))
-    }
-
-    pub fn version(&self) -> jmt::Version {
-        self.version
-    }
-
-    /// Returns some value corresponding to the key, along with an ICS23 existence proof
-    /// up to the current JMT root hash. If the key is not present, returns `None` and a
-    /// non-existence proof.
-    pub(crate) fn get_with_proof(
-        &self,
-        key: Vec<u8>,
-    ) -> Result<(Option<Vec<u8>>, ics23::CommitmentProof)> {
-        let version = self.version();
-        let tree = jmt::Sha256Jmt::new(self);
-        tree.get_with_ics23_proof(key, version)
-    }
-
-    /// Helper function used by `get_raw` and `prefix_raw`.
-    ///
-    /// Reads from the JMT will fail if the root is missing; this method
-    /// special-cases the empty tree case so that reads on an empty tree just
-    /// return None.
-    pub fn get_jmt(&self, key: jmt::KeyHash) -> Result<Option<Vec<u8>>> {
-        let tree = jmt::Sha256Jmt::new(self);
-        match tree.get(key, self.version()) {
-            Ok(Some(value)) => {
-                tracing::trace!(substore = ?self.config.prefix, version = ?self.version(), ?key, value = ?hex::encode(&value), "read from tree");
-                Ok(Some(value))
-            }
-            Ok(None) => {
-                tracing::trace!(substore = ?self.config.prefix, version = ?self.version(), ?key, "key not found in tree");
-                Ok(None)
-            }
-            // This allows for using the Overlay on an empty database without
-            // errors We only skip the `MissingRootError` if the `version` is
-            // `u64::MAX`, the pre-genesis version. Otherwise, a missing root
-            // actually does indicate a problem.
-            Err(e)
-                if e.downcast_ref::<jmt::MissingRootError>().is_some()
-                    && self.version() == u64::MAX =>
-            {
-                tracing::trace!(substore = ?self.config.prefix, version = ?self.version(), "no data available at this version");
-                Ok(None)
-            }
-            Err(e) => Err(e),
-        }
-    }
-}
-
-impl TreeReader for SubstoreSnapshot {
-    /// Gets a value by identifier, returning the newest value whose version is *less than or
-    /// equal to* the specified version.  Returns `None` if the value does not exist.
-    fn get_value_option(
-        &self,
-        max_version: jmt::Version,
-        key_hash: KeyHash,
-    ) -> Result<Option<jmt::OwnedValue>> {
-        let cf_jmt_values = self.config.cf_jmt_values(&self.db);
-
-        // Prefix ranges exclude the upper bound in the iterator result.
-        // This means that when requesting the largest possible version, there
-        // is no way to specify a range that is inclusive of `u64::MAX`.
-        if max_version == u64::MAX {
-            let k = VersionedKeyHash {
-                version: u64::MAX,
-                key_hash,
-            };
-
-            if let Some(v) = self.rocksdb_snapshot.get_cf(cf_jmt_values, k.encode())? {
-                let maybe_value: Option<Vec<u8>> = BorshDeserialize::try_from_slice(v.as_ref())?;
-                return Ok(maybe_value);
-            }
-        }
-
-        let mut lower_bound = key_hash.0.to_vec();
-        lower_bound.extend_from_slice(&0u64.to_be_bytes());
-
-        let mut upper_bound = key_hash.0.to_vec();
-        // The upper bound is excluded from the iteration results.
-        upper_bound.extend_from_slice(&(max_version.saturating_add(1)).to_be_bytes());
-
-        let mut readopts = ReadOptions::default();
-        readopts.set_iterate_lower_bound(lower_bound);
-        readopts.set_iterate_upper_bound(upper_bound);
-        let mut iterator =
-            self.rocksdb_snapshot
-                .iterator_cf_opt(cf_jmt_values, readopts, IteratorMode::End);
-
-        let Some(tuple) = iterator.next() else {
-            return Ok(None);
-        };
-
-        let (_key, v) = tuple?;
-        let maybe_value = BorshDeserialize::try_from_slice(v.as_ref())?;
-        Ok(maybe_value)
-    }
-
-    /// Gets node given a node key. Returns `None` if the node does not exist.
-    fn get_node_option(&self, node_key: &NodeKey) -> Result<Option<Node>> {
-        let db_node_key = DbNodeKey::from(node_key.clone());
-        tracing::trace!(?node_key);
-
-        let cf_jmt = self.config.cf_jmt(&self.db);
-        let value = self
-            .rocksdb_snapshot
-            .get_cf(cf_jmt, db_node_key.encode()?)?
-            .map(|db_slice| Node::try_from_slice(&db_slice))
-            .transpose()?;
-
-        tracing::trace!(?node_key, ?value);
-        Ok(value)
-    }
-
-    fn get_rightmost_leaf(&self) -> Result<Option<(NodeKey, LeafNode)>> {
-        let cf_jmt = self.config.cf_jmt(&self.db);
-        let mut iter = self.rocksdb_snapshot.raw_iterator_cf(cf_jmt);
-        iter.seek_to_last();
-
-        if iter.valid() {
-            let node_key =
-                DbNodeKey::decode(iter.key().expect("all DB entries should have a key"))?
-                    .into_inner();
-            let node =
-                Node::try_from_slice(iter.value().expect("all DB entries should have a value"))?;
-
-            if let Node::Leaf(leaf_node) = node {
-                return Ok(Some((node_key, leaf_node)));
-            }
-        } else {
-            // There are no keys in the database
-        }
-
-        Ok(None)
-    }
-}
-
-impl HasPreimage for SubstoreSnapshot {
-    fn preimage(&self, key_hash: KeyHash) -> Result<Option<Vec<u8>>> {
-        let cf_jmt_keys_by_keyhash = self.config.cf_jmt_keys_by_keyhash(&self.db);
-
-        Ok(self
-            .rocksdb_snapshot
-            .get_cf(cf_jmt_keys_by_keyhash, key_hash.0)?)
-    }
-}
-
-pub struct SubstoreStorage {
-    pub(crate) substore_snapshot: SubstoreSnapshot,
-}
-
-impl SubstoreStorage {
-    pub async fn commit(
-        self,
-        cache: Cache,
-        mut write_batch: rocksdb::WriteBatch,
-        write_version: jmt::Version,
-        perform_migration: bool,
-    ) -> Result<(RootHash, rocksdb::WriteBatch)> {
-        let span = Span::current();
-
-        tokio::task
-                ::spawn_blocking(move || {
-                    span.in_scope(|| {
-                        let jmt = jmt::Sha256Jmt::new(&self.substore_snapshot);
-                        let unwritten_changes: Vec<_> = cache
-                            .unwritten_changes
-                            .into_iter()
-                            .map(|(key, some_value)| (KeyHash::with::<sha2::Sha256>(&key), key, some_value))
-                            .collect();
-
-                        let cf_jmt_keys = self.substore_snapshot.config.cf_jmt_keys(&self.substore_snapshot.db);
-                        let cf_jmt_keys_by_keyhash = self.substore_snapshot.config.cf_jmt_keys_by_keyhash(&self.substore_snapshot.db);
-                        let cf_jmt = self.substore_snapshot.config.cf_jmt(&self.substore_snapshot.db);
-                        let cf_jmt_values = self.substore_snapshot.config.cf_jmt_values(&self.substore_snapshot.db);
-
-                        /* Keyhash and pre-image indices */
-                        for (keyhash, key_preimage, value) in unwritten_changes.iter() {
-                            match value {
-                                Some(_) => { /* Key inserted, or updated, so we add it to the keyhash index */
-                                    write_batch.put_cf(cf_jmt_keys, key_preimage, keyhash.0);
-                                        write_batch
-                                        .put_cf(cf_jmt_keys_by_keyhash, keyhash.0, key_preimage)
-                                }
-                                None => { /* Key deleted, so we delete it from the preimage and keyhash index entries */
-                                    write_batch.delete_cf(cf_jmt_keys, key_preimage);
-                                    write_batch.delete_cf(cf_jmt_keys_by_keyhash, keyhash.0);
-                                }
-                            };
-                        }
-
-                        // We only track the keyhash and possible values; at the time of writing,
-                        // `rustfmt` panics on inlining the closure, so we use a helper function to skip the key.
-                        let skip_key = |(keyhash, _key, some_value)| (keyhash, some_value);
-
-                        let (root_hash, batch) = if perform_migration {
-                            jmt.append_value_set(unwritten_changes.into_iter().map(skip_key), write_version)?
-                        } else {
-                            jmt.put_value_set(unwritten_changes.into_iter().map(skip_key), write_version)?
-                        };
-
-                        /* JMT nodes and values */
-                        for (node_key, node) in batch.node_batch.nodes() {
-                            let db_node_key_bytes= DbNodeKey::encode_from_node_key(node_key)?;
-                            let value_bytes = borsh::to_vec(node)?;
-                            tracing::trace!(?db_node_key_bytes, value_bytes = ?hex::encode(&value_bytes));
-                            write_batch.put_cf(cf_jmt, db_node_key_bytes, value_bytes);
-                        }
-
-
-                        for ((version, key_hash), some_value) in batch.node_batch.values() {
-                            let key_bytes = VersionedKeyHash::encode_from_keyhash(key_hash, version);
-                            let value_bytes = borsh::to_vec(some_value)?;
-                            tracing::trace!(?key_bytes, value_bytes = ?hex::encode(&value_bytes));
-                            write_batch.put_cf(cf_jmt_values, key_bytes, value_bytes);
-                        }
-
-                        tracing::trace!(?root_hash, "accumulated node changes in the write batch");
-
-
-                        for (k, v) in cache.nonverifiable_changes.into_iter() {
-                            let cf_nonverifiable = self.substore_snapshot.config.cf_nonverifiable(&self.substore_snapshot.db);
-                            match v {
-                                Some(v) => {
-                                    tracing::trace!(key = ?crate::EscapedByteSlice(&k), value = ?crate::EscapedByteSlice(&v), "put nonverifiable key");
-                                    write_batch.put_cf(cf_nonverifiable, k, &v);
-                                }
-                                None => {
-                                    write_batch.delete_cf(cf_nonverifiable, k);
-                                }
-                            };
-                        }
-
-                        Ok((root_hash, write_batch))
-                    })
-                })
-                .await?
-    }
-}
-
-impl TreeWriter for SubstoreStorage {
-    fn write_node_batch(&self, _node_batch: &jmt::storage::NodeBatch) -> Result<()> {
-        // The "write"-part of the `TreeReader + TreeWriter` jmt architecture does not work
-        // well with a deferred write strategy.
-        // What we would like to do is to accumulate the changes in a write batch, and then commit
-        // them all at once. This isn't possible to do easily because the `TreeWriter` trait
-        // rightfully does not expose RocksDB-specific types in its API.
-        //
-        // The alternative is to use interior mutability but the semantics become
-        // so implementation specific that we lose the benefits of the trait abstraction.
-        unimplemented!("We inline the tree writing logic in the `commit` method")
-    }
-}
-
-/// An ordered node key is a node key that is encoded in a way that
-/// preserves the order of the node keys in the database.
-pub struct DbNodeKey(pub NodeKey);
-
-impl DbNodeKey {
-    pub fn from(node_key: NodeKey) -> Self {
-        DbNodeKey(node_key)
-    }
-
-    pub fn into_inner(self) -> NodeKey {
-        self.0
-    }
-
-    pub fn encode(&self) -> Result<Vec<u8>> {
-        Self::encode_from_node_key(&self.0)
-    }
-
-    pub fn encode_from_node_key(node_key: &NodeKey) -> Result<Vec<u8>> {
-        let mut bytes = Vec::new();
-        bytes.extend_from_slice(&node_key.version().to_be_bytes()); // encode version as big-endian
-        let rest = borsh::to_vec(node_key)?;
-        bytes.extend_from_slice(&rest);
-        Ok(bytes)
-    }
-
-    pub fn decode(bytes: impl AsRef<[u8]>) -> Result<Self> {
-        if bytes.as_ref().len() < 8 {
-            anyhow::bail!("byte slice is too short")
-        }
-        // Ignore the bytes that encode the version
-        let node_key_slice = bytes.as_ref()[8..].to_vec();
-        let node_key = borsh::BorshDeserialize::try_from_slice(&node_key_slice)?;
-        Ok(DbNodeKey(node_key))
-    }
-}
-
-/// Represent a JMT key hash at a specific `jmt::Version`
-/// This is used to index the JMT values in RocksDB.
-#[derive(Clone, Debug)]
-pub struct VersionedKeyHash {
-    pub key_hash: KeyHash,
-    pub version: jmt::Version,
-}
-
-impl VersionedKeyHash {
-    pub fn encode(&self) -> Vec<u8> {
-        VersionedKeyHash::encode_from_keyhash(&self.key_hash, &self.version)
-    }
-
-    pub fn encode_from_keyhash(key_hash: &KeyHash, version: &jmt::Version) -> Vec<u8> {
-        let mut buf: Vec<u8> = key_hash.0.to_vec();
-        buf.extend_from_slice(&version.to_be_bytes());
-        buf
-    }
-
-    #[allow(dead_code)]
-    pub fn decode(buf: Vec<u8>) -> Result<Self> {
-        if buf.len() != 40 {
-            Err(anyhow::anyhow!(
-                "could not decode buffer into VersionedKey (invalid size)"
-            ))
-        } else {
-            let raw_key_hash: [u8; 32] = buf[0..32]
-                .try_into()
-                .expect("buffer is at least 40 bytes wide");
-            let key_hash = KeyHash(raw_key_hash);
-
-            let raw_version: [u8; 8] = buf[32..40]
-                .try_into()
-                .expect("buffer is at least 40 bytes wide");
-            let version: u64 = u64::from_be_bytes(raw_version);
-
-            Ok(VersionedKeyHash { version, key_hash })
-        }
-    }
-}
diff --git a/crates/cnidarium/src/tests.rs b/crates/cnidarium/src/tests.rs
deleted file mode 100644
index 9fe5bb43a3..0000000000
--- a/crates/cnidarium/src/tests.rs
+++ /dev/null
@@ -1,1468 +0,0 @@
-use crate::*;
-use futures::StreamExt;
-
-/// Checks that deleting a nonexistent key behaves as expected (no errors, it's already gone)
-#[tokio::test]
-async fn delete_nonexistent_key() -> anyhow::Result<()> {
-    let tmpdir = tempfile::tempdir()?;
-    // Initialize an empty Storage in the new directory
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-
-    let mut state_init = StateDelta::new(storage.latest_snapshot());
-    state_init.delete("nonexist".to_string());
-    storage.commit(state_init).await?;
-
-    Ok(())
-}
-
-#[tokio::test]
-/// In rare cases, the database lock has not been (yet) released by the time
-/// the next Storage::load() call is made. This is fixed by `Storage::release()`
-/// which mimicks the behavior of an async drop (releasing resources).
-async fn db_lock_is_released() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-    storage.release().await;
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-    storage.release().await;
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-    storage.release().await;
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-    storage.release().await;
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-    storage.release().await;
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-    storage.release().await;
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-    storage.release().await;
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-    storage.release().await;
-
-    Ok(())
-}
-
-#[tokio::test]
-async fn simple_flow() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-
-    // Initialize an empty Storage in the new directory
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-
-    // Version -1 to Version 0 writes
-    //
-    // tx00: test => test
-    // tx00: c/aa => 0 [object store]
-    // tx00: c/ab => 1 [object store]
-    // tx00: c/ac => 2 [object store]
-    // tx00: c/ad => 3 [object store]
-    // tx00: iA => A [nonverifiable store]
-    // tx00: iC => C [nonverifiable store]
-    // tx00: iF => F [nonverifiable store]
-    // tx00: iD => D [nonverifiable store]
-    // tx01: a/aa => aa
-    // tx01: a/aaa => aaa
-    // tx01: a/ab => ab
-    // tx01: a/z  => z
-    // tx01: c/ab => 10 [object store]
-    // tx01: c/ac => [deleted] [object store]
-    //
-    // Version 0 to Version 1 writes
-    // tx10: test => [deleted]
-    // tx10: a/aaa => [deleted]
-    // tx10: a/c => c
-    // tx10: iB => B [nonverifiable store]
-    // tx11: a/ab => ab2
-    // tx11: iD => [deleted] nonverifiable store]
-
-    let mut state_init = StateDelta::new(storage.latest_snapshot());
-    // Check that reads on an empty state return Ok(None)
-    assert_eq!(state_init.get_raw("test").await?, None);
-    assert_eq!(state_init.get_raw("a/aa").await?, None);
-
-    // Create tx00
-    let mut tx00 = StateDelta::new(&mut state_init);
-    tx00.put_raw("test".to_owned(), b"test".to_vec());
-    tx00.object_put("c/aa", 0u64);
-    tx00.object_put("c/ab", 1u64);
-    tx00.object_put("c/ac", 2u64);
-    tx00.object_put("c/ad", 3u64);
-    tx00.nonverifiable_put_raw(b"iA".to_vec(), b"A".to_vec());
-    tx00.nonverifiable_put_raw(b"iC".to_vec(), b"C".to_vec());
-    tx00.nonverifiable_put_raw(b"iF".to_vec(), b"F".to_vec());
-    tx00.nonverifiable_put_raw(b"iD".to_vec(), b"D".to_vec());
-
-    // Check reads against tx00:
-    //     This is present in tx00
-    assert_eq!(tx00.get_raw("test").await?, Some(b"test".to_vec()));
-    //     This is missing in tx00 and state_init and tree is empty
-    assert_eq!(tx00.get_raw("a/aa").await?, None);
-    //     Present in tx00 object store
-    assert_eq!(tx00.object_get("c/aa"), Some(0u64));
-    assert_eq!(tx00.object_get("c/ab"), Some(1u64));
-    assert_eq!(tx00.object_get("c/ac"), Some(2u64));
-    assert_eq!(tx00.object_get("c/ad"), Some(3u64));
-    //     Missing in tx00 object store
-    assert_eq!(tx00.object_get::<bool>("nonexist"), None);
-    //     Nonconsensus range checks
-    let mut range = tx00.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"D".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Now apply the transaction to state_init
-    tx00.apply();
-    assert_eq!(state_init.get_raw("test").await?, Some(b"test".to_vec()));
-    assert_eq!(state_init.get_raw("a/aa").await?, None);
-    //     Present in state_init object store
-    assert_eq!(state_init.object_get("c/aa"), Some(0u64));
-    assert_eq!(state_init.object_get("c/ab"), Some(1u64));
-    assert_eq!(state_init.object_get("c/ac"), Some(2u64));
-    assert_eq!(state_init.object_get("c/ad"), Some(3u64));
-    //     Missing in state_init object store
-    assert_eq!(state_init.object_get::<bool>("nonexist"), None);
-    //     Nonconsensus range checks
-    let mut range = state_init.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"D".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Create a transaction writing the other keys.
-    let mut tx01 = StateDelta::new(&mut state_init);
-    tx01.put_raw("a/aa".to_owned(), b"aa".to_vec());
-    tx01.put_raw("a/aaa".to_owned(), b"aaa".to_vec());
-    tx01.put_raw("a/ab".to_owned(), b"ab".to_vec());
-    tx01.put_raw("a/z".to_owned(), b"z".to_vec());
-    tx01.object_put("c/ab", 10u64);
-    tx01.object_delete("c/ac");
-
-    // Check reads against tx01:
-    //    This is missing in tx01 and reads through to state_init
-    assert_eq!(tx01.get_raw("test").await?, Some(b"test".to_vec()));
-    //    This is present in tx01
-    assert_eq!(tx01.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(tx01.get_raw("a/aaa").await?, Some(b"aaa".to_vec()));
-    assert_eq!(tx01.get_raw("a/ab").await?, Some(b"ab".to_vec()));
-    assert_eq!(tx01.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is missing in tx01 and in state_init
-    assert_eq!(tx01.get_raw("a/c").await?, None);
-    let mut range = tx01.prefix_raw("a/");
-    let mut range_keys = tx01.prefix_keys("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range_keys.next().await.transpose()?,
-        Some("a/aa".to_owned())
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aaa".to_owned(), b"aaa".to_vec()))
-    );
-    assert_eq!(
-        range_keys.next().await.transpose()?,
-        Some("a/aaa".to_owned())
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab".to_vec()))
-    );
-    assert_eq!(
-        range_keys.next().await.transpose()?,
-        Some("a/ab".to_owned())
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range_keys.next().await.transpose()?, Some("a/z".to_owned()));
-    assert_eq!(range.next().await.transpose()?, None);
-    assert_eq!(range_keys.next().await.transpose()?, None);
-    std::mem::drop(range);
-    std::mem::drop(range_keys);
-
-    // Now apply the transaction to state_init
-    tx01.apply();
-
-    // Check reads against state_init:
-    //    This is present in state_init
-    assert_eq!(state_init.get_raw("test").await?, Some(b"test".to_vec()));
-    assert_eq!(state_init.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state_init.get_raw("a/aaa").await?, Some(b"aaa".to_vec()));
-    assert_eq!(state_init.get_raw("a/ab").await?, Some(b"ab".to_vec()));
-    assert_eq!(state_init.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is missing in state_init
-    assert_eq!(state_init.get_raw("a/c").await?, None);
-    let mut range = state_init.prefix_raw("a/");
-    let mut range_keys = state_init.prefix_keys("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range_keys.next().await.transpose()?,
-        Some("a/aa".to_owned())
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aaa".to_owned(), b"aaa".to_vec()))
-    );
-    assert_eq!(
-        range_keys.next().await.transpose()?,
-        Some("a/aaa".to_owned())
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab".to_vec()))
-    );
-    assert_eq!(
-        range_keys.next().await.transpose()?,
-        Some("a/ab".to_owned())
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range_keys.next().await.transpose()?, Some("a/z".to_owned()));
-    assert_eq!(range.next().await.transpose()?, None);
-    assert_eq!(range_keys.next().await.transpose()?, None);
-    std::mem::drop(range);
-    std::mem::drop(range_keys);
-
-    // Now commit state_init to storage
-    storage.commit(state_init).await?;
-
-    // Now we have version 0.
-    let state0 = storage.latest_snapshot();
-    assert_eq!(state0.version(), 0);
-    let mut state0 = StateDelta::new(state0);
-
-    // Check reads against state0:
-    //    This is missing in state0 and present in JMT
-    assert_eq!(state0.get_raw("test").await?, Some(b"test".to_vec()));
-    assert_eq!(state0.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state0.get_raw("a/aaa").await?, Some(b"aaa".to_vec()));
-    assert_eq!(state0.get_raw("a/ab").await?, Some(b"ab".to_vec()));
-    assert_eq!(state0.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is missing in state0 and missing in JMT
-    assert_eq!(state0.get_raw("a/c").await?, None);
-    let mut range = state0.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aaa".to_owned(), b"aaa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    //     Nonconsensus prefix checks
-    let mut range = state0.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"D".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Start building a transaction
-    let mut tx10 = StateDelta::new(&mut state0);
-    tx10.delete("test".to_owned());
-    tx10.delete("a/aaa".to_owned());
-    tx10.put_raw("a/c".to_owned(), b"c".to_vec());
-    tx10.nonverifiable_put_raw(b"iB".to_vec(), b"B".to_vec());
-
-    // Check reads against tx10:
-    //    This is deleted in tx10, missing in state0, present in JMT
-    assert_eq!(tx10.get_raw("test").await?, None);
-    assert_eq!(tx10.get_raw("a/aaa").await?, None);
-    //    This is missing in tx10, missing in state0, present in JMT
-    assert_eq!(tx10.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(tx10.get_raw("a/ab").await?, Some(b"ab".to_vec()));
-    assert_eq!(tx10.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is present in tx10, missing in state0, missing in JMT
-    assert_eq!(tx10.get_raw("a/c").await?, Some(b"c".to_vec()));
-    let mut range = tx10.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/c".to_owned(), b"c".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    //     Nonconsensus prefix checks
-    let mut range = tx10.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"D".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Apply tx10 to state0
-    tx10.apply();
-
-    // Check reads against state0
-    //    This is deleted in state0, present in JMT
-    assert_eq!(state0.get_raw("test").await?, None);
-    assert_eq!(state0.get_raw("a/aaa").await?, None);
-    //    This is missing in state0, present in JMT
-    assert_eq!(state0.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state0.get_raw("a/ab").await?, Some(b"ab".to_vec()));
-    assert_eq!(state0.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is present in state0, missing in JMT
-    assert_eq!(state0.get_raw("a/c").await?, Some(b"c".to_vec()));
-    let mut range = state0.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/c".to_owned(), b"c".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Start building another transaction
-    let mut tx11 = StateDelta::new(&mut state0);
-    tx11.put_raw("a/ab".to_owned(), b"ab2".to_vec());
-    tx11.nonverifiable_delete(b"iD".to_vec());
-
-    // Check reads against tx11:
-    //    This is present in tx11, missing in state0, present in JMT
-    assert_eq!(tx11.get_raw("a/ab").await?, Some(b"ab2".to_vec()));
-    //    This is missing in tx11, deleted in state0, present in JMT
-    assert_eq!(tx11.get_raw("test").await?, None);
-    assert_eq!(tx11.get_raw("a/aaa").await?, None);
-    //    This is missing in tx11, missing in state0, present in JMT
-    assert_eq!(tx11.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(tx11.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is missing in tx10, present in state0, missing in JMT
-    assert_eq!(tx11.get_raw("a/c").await?, Some(b"c".to_vec()));
-    let mut range = tx11.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab2".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/c".to_owned(), b"c".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    //     Nonconsensus range checks
-    let mut range = tx11.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Apply tx11 to state0
-    tx11.apply();
-
-    // Check reads against state0
-    //    This is deleted in state0, present in JMT
-    assert_eq!(state0.get_raw("test").await?, None);
-    assert_eq!(state0.get_raw("a/aaa").await?, None);
-    //    This is missing in state0, present in JMT
-    assert_eq!(state0.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state0.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is present in state0, missing in JMT
-    assert_eq!(state0.get_raw("a/c").await?, Some(b"c".to_vec()));
-    //    This is present in state0, present in JMT
-    assert_eq!(state0.get_raw("a/ab").await?, Some(b"ab2".to_vec()));
-    let mut range = state0.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab2".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/c".to_owned(), b"c".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    let mut range = state0.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Create another fork of state 0 while we've edited the first one but before we commit.
-    let state0a = storage.latest_snapshot();
-    assert_eq!(state0a.version(), 0);
-
-    // Commit state0 as state1.
-    storage.commit(state0).await?;
-
-    let state1 = storage.latest_snapshot();
-    assert_eq!(state1.version(), 1);
-
-    // Check reads against state1
-    assert_eq!(state1.get_raw("test").await?, None);
-    assert_eq!(state1.get_raw("a/aaa").await?, None);
-    assert_eq!(state1.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state1.get_raw("a/ab").await?, Some(b"ab2".to_vec()));
-    assert_eq!(state1.get_raw("a/z").await?, Some(b"z".to_vec()));
-    assert_eq!(state1.get_raw("a/c").await?, Some(b"c".to_vec()));
-    let mut range = state1.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab2".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/c".to_owned(), b"c".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    let mut range = state1.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Check reads against state0a
-    assert_eq!(state0a.get_raw("test").await?, Some(b"test".to_vec()));
-    assert_eq!(state0a.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state0a.get_raw("a/aaa").await?, Some(b"aaa".to_vec()));
-    assert_eq!(state0a.get_raw("a/ab").await?, Some(b"ab".to_vec()));
-    assert_eq!(state0a.get_raw("a/z").await?, Some(b"z".to_vec()));
-    assert_eq!(state0a.get_raw("a/c").await?, None);
-    let mut range = state0a.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aaa".to_owned(), b"aaa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    //     Nonconsensus range checks
-    let mut range = state0a.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"D".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Now, check that closing and reloading works.
-
-    // First, be sure to explicitly drop anything keeping a reference to the
-    // RocksDB instance:
-    storage.release().await;
-    // std::mem::drop(state0); // consumed in commit()
-    std::mem::drop(state0a);
-    std::mem::drop(state1);
-
-    // Now reload the storage from the same directory...
-    let storage_a = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-    let state1a = storage_a.latest_snapshot();
-
-    // Check that we reload at the correct version ...
-    assert_eq!(state1a.version(), 1);
-
-    // Check reads against state1a after reloading the DB
-    assert_eq!(state1a.get_raw("test").await?, None);
-    assert_eq!(state1a.get_raw("a/aaa").await?, None);
-    assert_eq!(state1a.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state1a.get_raw("a/ab").await?, Some(b"ab2".to_vec()));
-    assert_eq!(state1a.get_raw("a/z").await?, Some(b"z".to_vec()));
-    assert_eq!(state1a.get_raw("a/c").await?, Some(b"c".to_vec()));
-    let mut range = state1a.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab2".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/c".to_owned(), b"c".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    //     Nonconsensus range checks
-    let mut range = state1a.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    let mut range = state1a.nonverifiable_range_raw(Some(b"i"), b"A".to_vec()..b"C".to_vec())?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    let mut range = state1a.nonverifiable_range_raw(Some(b"i"), b"B".to_vec()..b"C".to_vec())?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let mut range = state1a.nonverifiable_range_raw(Some(b"i"), b"A".to_vec()..b"F".to_vec())?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let mut range = state1a.nonverifiable_range_raw(Some(b"i"), b"A".to_vec()..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-
-    let mut range = state1a.nonverifiable_range_raw(Some(b"i"), ..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let mut range = state1a.nonverifiable_range_raw(None, b"i".to_vec()..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let mut range = state1a.nonverifiable_range_raw(None, b"iA".to_vec()..b"iB".to_vec())?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that range queries over the nonverifiable store work as expected.
-/// A range query can have a prefix, a start key, and an end key, so we want to test:
-/// - queries with no prefix, no start key, and no end key
-/// - queries with no prefix, a start key, and no end key
-/// - queries with no prefix, no start key, and an end key
-/// - queries with no prefix, a start key, and an end key
-/// - queries with a prefix, no start key, and no end key
-/// - queries with a prefix, a start key, and no end key
-/// - queries with a prefix, no start key, and an end key
-async fn range_queries_basic() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-
-    let mut state_init = StateDelta::new(storage.latest_snapshot());
-
-    // Check that range queries over an empty store work does not return any results.
-    let mut range = state_init.nonverifiable_range_raw(None, ..)?;
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let mut tx00 = StateDelta::new(&mut state_init);
-    tx00.nonverifiable_put_raw(b"iA".to_vec(), b"A".to_vec());
-    tx00.nonverifiable_put_raw(b"iC".to_vec(), b"C".to_vec());
-    tx00.nonverifiable_put_raw(b"iF".to_vec(), b"F".to_vec());
-    tx00.nonverifiable_put_raw(
-        b"random_key_not_prefixed".to_vec(),
-        b"quetzalcoatl".to_vec(),
-    );
-
-    // Check that keys with the wrong prefix are not included in the results.
-    let mut range = tx00.nonverifiable_range_raw(Some(b"i"), ..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Insert an entry that precedes the current last entry
-    tx00.nonverifiable_put_raw(b"iD".to_vec(), b"D".to_vec());
-
-    // Check that the new entry is included in the results.
-    let mut range = tx00.nonverifiable_range_raw(Some(b"i"), ..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"D".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    tx00.apply();
-    // Check that the new entry is included in the results.
-    let mut range = state_init.nonverifiable_range_raw(Some(b"i"), ..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"D".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let mut tx01 = StateDelta::new(&mut state_init);
-    tx01.nonverifiable_delete(b"iA".to_vec());
-    tx01.nonverifiable_put_raw(b"iC".to_vec(), b"China".to_vec());
-    tx01.nonverifiable_put_raw(b"iD".to_vec(), b"Denmark".to_vec());
-    tx01.nonverifiable_put_raw(b"iF".to_vec(), b"Finland".to_vec());
-
-    // Check that the updated entries are included in the results.
-    let mut range = tx01.nonverifiable_range_raw(Some(b"i"), ..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"China".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"Denmark".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"Finland".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Check that setting the lower bound to the first key doesn't change the results.
-    let mut range = tx01.nonverifiable_range_raw(Some(b"i"), b"C".to_vec()..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"China".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"Denmark".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"Finland".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Check that setting the upper bound to a key that doesn't exist doesn't change the results.
-    let mut range = tx01.nonverifiable_range_raw(Some(b"i"), ..b"Z".to_vec())?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"China".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"Denmark".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"Finland".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Check that using a manually prefixed keys doesn't change the results.
-    let mut range = tx01.nonverifiable_range_raw(None, b"i".to_vec()..b"iZ".to_vec())?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"China".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"Denmark".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"Finland".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    tx01.apply();
-
-    // Check that all entries are included in the results.
-    let mut range = state_init.nonverifiable_range_raw(None, ..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"China".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"Denmark".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"Finland".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((
-            b"random_key_not_prefixed".to_vec(),
-            b"quetzalcoatl".to_vec()
-        ))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let mut tx02 = StateDelta::new(&mut state_init);
-
-    for i in 0..=100 {
-        tx02.nonverifiable_put_raw(
-            format!("compact_block/{:020}", i).as_bytes().to_vec(),
-            format!("{}", i).as_bytes().to_vec(),
-        );
-    }
-
-    // Check that all compact blocks are included in the results.
-    let mut range = tx02.nonverifiable_range_raw(Some(b"compact_block/"), ..)?;
-    for i in 0..=100 {
-        assert_eq!(
-            range.next().await.transpose()?,
-            Some((
-                format!("compact_block/{:020}", i).as_bytes().to_vec(),
-                format!("{}", i).as_bytes().to_vec()
-            ))
-        );
-    }
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    let cb_10 = format!("{:020}", 10).as_bytes().to_vec();
-
-    // Check that setting a lower bound works.
-    let mut range = tx02.nonverifiable_range_raw(Some(b"compact_block/"), cb_10.clone()..)?;
-    for i in 10..=100 {
-        assert_eq!(
-            range.next().await.transpose()?,
-            Some((
-                format!("compact_block/{:020}", i).as_bytes().to_vec(),
-                format!("{}", i).as_bytes().to_vec()
-            )),
-            "i={}",
-            i
-        );
-    }
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let cb_20 = format!("{:020}", 20).as_bytes().to_vec();
-
-    // Check that specifying a full range works.
-    let mut range =
-        tx02.nonverifiable_range_raw(Some(b"compact_block/"), cb_10.clone()..cb_20.clone())?;
-    for i in 10..20 {
-        assert_eq!(
-            range.next().await.transpose()?,
-            Some((
-                format!("compact_block/{:020}", i).as_bytes().to_vec(),
-                format!("{}", i).as_bytes().to_vec()
-            ))
-        );
-    }
-    assert_eq!(range.next().await.transpose()?, None);
-
-    // Check that leaving the lower bound unspecified works.
-    let mut range = tx02.nonverifiable_range_raw(Some(b"compact_block/"), ..cb_20)?;
-    for i in 0..20 {
-        assert_eq!(
-            range.next().await.transpose()?,
-            Some((
-                format!("compact_block/{:020}", i).as_bytes().to_vec(),
-                format!("{}", i).as_bytes().to_vec()
-            ))
-        );
-    }
-    assert_eq!(range.next().await.transpose()?, None);
-
-    // Delete compact blocks [9;21]
-    let deleted_keys = (9..=21)
-        .map(|i| format!("compact_block/{:020}", i).as_bytes().to_vec())
-        .collect::<Vec<_>>();
-    for key in deleted_keys.iter() {
-        tx02.nonverifiable_delete(key.clone());
-    }
-
-    // Check that the deleted compact blocks are not included in the results.
-    let mut range = tx02.nonverifiable_range_raw(Some(b"compact_block/"), ..)?;
-    for i in 0..=100 {
-        if (9..=21).contains(&i) {
-            continue;
-        }
-        assert_eq!(
-            range.next().await.transpose()?,
-            Some((
-                format!("compact_block/{:020}", i).as_bytes().to_vec(),
-                format!("{}", i).as_bytes().to_vec()
-            )),
-            "i={}",
-            i
-        );
-    }
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let cb_9 = format!("{:020}", 9).as_bytes().to_vec();
-    let cb_15 = format!("{:020}", 15).as_bytes().to_vec();
-    let cb_21 = format!("{:020}", 21).as_bytes().to_vec();
-    let cb_22 = format!("{:020}", 22).as_bytes().to_vec();
-    let cb_23 = format!("{:020}", 23).as_bytes().to_vec();
-
-    // Check that the deleted compact blocks are not included in the results, even if they're in the bound argument.
-    let mut range = tx02.nonverifiable_range_raw(Some(b"compact_block/"), cb_9.clone()..)?;
-    for i in 22..=100 {
-        let found = range.next().await.transpose()?;
-        let foundstr = String::from_utf8(found.clone().unwrap().0).unwrap();
-        println!("{i}: foundstr={}", foundstr);
-        assert_eq!(
-            found,
-            Some((
-                format!("compact_block/{:020}", i).as_bytes().to_vec(),
-                format!("{}", i).as_bytes().to_vec()
-            ))
-        );
-    }
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Check a variety of deleted bounds.
-    let mut range = tx02.nonverifiable_range_raw(Some(b"compact_block/"), cb_9.clone()..cb_15)?;
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let mut range = tx02.nonverifiable_range_raw(Some(b"compact_block/"), cb_9.clone()..cb_21)?;
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let mut range = tx02.nonverifiable_range_raw(Some(b"compact_block/"), cb_9.clone()..cb_22)?;
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let mut range = tx02.nonverifiable_range_raw(Some(b"compact_block/"), cb_9.clone()..cb_23)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((
-            format!("compact_block/{:020}", 22).as_bytes().to_vec(),
-            format!("{}", 22).as_bytes().to_vec()
-        ))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that overwrites work correctly, and that we can read the latest value.
-async fn range_query_overwrites() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-
-    let state_init = StateDelta::new(storage.latest_snapshot());
-    // Check that reads on an empty state return Ok(None)
-    let mut range = state_init.nonverifiable_range_raw(None, ..)?;
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that inserting a value that precedes the peeked value works.
-async fn range_query_prepend_peeked_value() -> anyhow::Result<()> {
-    use crate::StateWrite;
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-
-    let mut state_init = StateDelta::new(storage.latest_snapshot());
-    state_init.nonverifiable_put_raw(b"b".to_vec(), b"beluga".to_vec());
-    state_init.nonverifiable_put_raw(b"c".to_vec(), b"charm".to_vec());
-    storage.commit(state_init).await?;
-
-    let mut state = StateDelta::new(storage.latest_snapshot());
-    let mut range = state.nonverifiable_range_raw(None, ..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"b".to_vec(), b"beluga".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"c".to_vec(), b"charm".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    state.nonverifiable_put_raw(b"a".to_vec(), b"aroma".to_vec());
-
-    // Check that the new value preceding the first peeked value is returned (no bound)
-    let mut range = state.nonverifiable_range_raw(None, ..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"a".to_vec(), b"aroma".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"b".to_vec(), b"beluga".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"c".to_vec(), b"charm".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Check that the new value preceding the first peeked value is returned (with bound)
-    let mut range = state.nonverifiable_range_raw(None, b"a".to_vec()..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"a".to_vec(), b"aroma".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"b".to_vec(), b"beluga".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"c".to_vec(), b"charm".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Check that the new value preceding the first peeked value is NOT returned.
-    let mut range = state.nonverifiable_range_raw(None, b"b".to_vec()..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"b".to_vec(), b"beluga".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"c".to_vec(), b"charm".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that specifying an inverted range does not work.
-async fn range_query_ordering() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-
-    let mut state_init = StateDelta::new(storage.latest_snapshot());
-    let mut range = state_init.nonverifiable_range_raw(None, ..)?;
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    state_init.nonverifiable_put_raw(b"c/charm".to_vec(), b"charm".to_vec());
-    state_init.nonverifiable_put_raw(b"a/aroma".to_vec(), b"aroma".to_vec());
-    state_init.nonverifiable_put_raw(b"a/apple".to_vec(), b"apple".to_vec());
-    state_init.nonverifiable_put_raw(b"b/boat".to_vec(), b"boat".to_vec());
-
-    let mut range = state_init.nonverifiable_range_raw(None, ..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"a/apple".to_vec(), b"apple".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"a/aroma".to_vec(), b"aroma".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"b/boat".to_vec(), b"boat".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"c/charm".to_vec(), b"charm".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let lower = b"b/".to_vec();
-    let upper = b"c/".to_vec();
-    let mut range = state_init.nonverifiable_range_raw(None, lower..upper)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"b/boat".to_vec(), b"boat".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let upper1 = b"c/".to_vec();
-    let upper2 = b"c/".to_vec();
-    let mut range = state_init.nonverifiable_range_raw(None, upper1..upper2)?;
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let lower = b"b/".to_vec();
-    let upper = b"c/".to_vec();
-    let range = state_init.nonverifiable_range_raw(None, upper..lower);
-    assert!(range.is_err());
-    std::mem::drop(range);
-
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that passing in an absurd range does not work.
-async fn range_query_bad_range() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-
-    let state_init = StateDelta::new(storage.latest_snapshot());
-
-    let lower = format!("{:020}", 0).as_bytes().to_vec();
-    let upper = format!("{:020}", 0).as_bytes().to_vec();
-
-    // Inclusive range are not supported.
-    let range = state_init.nonverifiable_range_raw(None, lower..=upper);
-    assert!(range.is_err());
-    std::mem::drop(range);
-
-    let lower = format!("{:020}", 0).as_bytes().to_vec();
-    let upper = format!("{:020}", 1).as_bytes().to_vec();
-    // Inclusive range are not supported.
-    let range = state_init.nonverifiable_range_raw(None, upper..lower);
-    assert!(range.is_err());
-
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that the semantics of the range query do not change when the state is
-/// persisted.
-async fn range_query_storage_basic() -> anyhow::Result<()> {
-    use crate::read::StateRead;
-    use crate::write::StateWrite;
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-    let mut delta = StateDelta::new(storage.latest_snapshot());
-
-    for height in 0..100 {
-        delta.nonverifiable_put_raw(
-            format!("compact_block/{:020}", height).as_bytes().to_vec(),
-            format!("compact_block/{:020}", height).as_bytes().to_vec(),
-        );
-    }
-
-    // We insert keys before the compact block keys.
-    for key in 0..10 {
-        delta.nonverifiable_put_raw(
-            format!("ante/{:020}", key).as_bytes().to_vec(),
-            format!("ante/{:020}", key).as_bytes().to_vec(),
-        );
-    }
-
-    // We insert keys after the compact block keys.
-    for key in 0..10 {
-        delta.nonverifiable_put_raw(
-            format!("post/{:020}", key).as_bytes().to_vec(),
-            format!("postƒ/{:020}", key).as_bytes().to_vec(),
-        );
-    }
-
-    storage.commit(delta).await?;
-
-    let state_init = storage.latest_snapshot();
-    let mut range = state_init.nonverifiable_range_raw(Some(b"compact_block/"), ..)?;
-    for height in 0..100 {
-        assert_eq!(
-            range.next().await.transpose()?,
-            Some((
-                format!("compact_block/{:020}", height).as_bytes().to_vec(),
-                format!("compact_block/{:020}", height).as_bytes().to_vec()
-            )),
-            "height: {}",
-            height
-        );
-    }
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let cb_50 = format!("{:020}", 50).as_bytes().to_vec();
-    let cb_80 = format!("{:020}", 80).as_bytes().to_vec();
-    let mut range = state_init.nonverifiable_range_raw(Some(b"compact_block/"), cb_50..cb_80)?;
-    for height in 50..80 {
-        assert_eq!(
-            range.next().await.transpose()?,
-            Some((
-                format!("compact_block/{:020}", height).as_bytes().to_vec(),
-                format!("compact_block/{:020}", height).as_bytes().to_vec()
-            )),
-            "height: {}",
-            height
-        );
-    }
-    assert_eq!(range.next().await.transpose()?, None);
-
-    let cb_80 = format!("{:020}", 80).as_bytes().to_vec();
-    let mut range = state_init.nonverifiable_range_raw(Some(b"compact_block/"), ..cb_80)?;
-    for height in 0..80 {
-        assert_eq!(
-            range.next().await.transpose()?,
-            Some((
-                format!("compact_block/{:020}", height).as_bytes().to_vec(),
-                format!("compact_block/{:020}", height).as_bytes().to_vec()
-            )),
-            "height: {}",
-            height
-        );
-    }
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that prefixed range queries work over the persisted state.
-async fn range_query_storage() -> anyhow::Result<()> {
-    use crate::read::StateRead;
-    use crate::write::StateWrite;
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-
-    let storage = Storage::load(tmpdir.path().to_owned(), vec![]).await?;
-    let mut delta = StateDelta::new(storage.latest_snapshot());
-
-    delta.nonverifiable_put_raw(b"a/aaaaa".to_vec(), b"1".to_vec());
-    delta.nonverifiable_put_raw(b"a/aaaab".to_vec(), b"2".to_vec());
-    delta.nonverifiable_put_raw(b"a/aaaac".to_vec(), b"3".to_vec());
-    delta.nonverifiable_put_raw(b"b/boat".to_vec(), b"4".to_vec());
-    storage.commit(delta).await?;
-
-    let state_init = storage.latest_snapshot();
-    let mut range = state_init.nonverifiable_range_raw(Some(b"a/"), ..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"a/aaaaa".to_vec(), b"1".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"a/aaaab".to_vec(), b"2".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"a/aaaac".to_vec(), b"3".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let mut range = state_init.nonverifiable_range_raw(Some(b"a/"), b"aaaa".to_vec()..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"a/aaaaa".to_vec(), b"1".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"a/aaaab".to_vec(), b"2".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"a/aaaac".to_vec(), b"3".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let mut range = state_init.nonverifiable_range_raw(Some(b"b/"), b"chorizo".to_vec()..)?;
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    let mut range = state_init.nonverifiable_range_raw(Some(b"b/"), ..)?;
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"b/boat".to_vec(), b"4".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    Ok(())
-}
diff --git a/crates/cnidarium/src/tests/delta.rs b/crates/cnidarium/src/tests/delta.rs
deleted file mode 100644
index ba1fae3a3f..0000000000
--- a/crates/cnidarium/src/tests/delta.rs
+++ /dev/null
@@ -1,721 +0,0 @@
-/*
-#[tokio::test]
-async fn garden_of_forking_paths() -> anyhow::Result<()> {
-    tracing_subscriber::fmt::init();
-    let storage = TempStorage::new().await?;
-
-    let mut state_init = storage.latest_snapshot();
-
-    // TODO: do we still want to have StateTransaction ?
-    // what if we just made StateDelta be StateTransaction ?
-    // what are the downsides? forced allocation for range queries?
-    // where do we get the events out?
-    let mut tx = state_init.begin_transaction();
-    tx.put_raw("base".to_owned(), b"base".to_vec());
-    tx.apply();
-    storage.commit(state_init).await?;
-
-    let mut state = storage.latest_snapshot();
-    let mut tx = state.begin_transaction();
-
-    // We can create a StateDelta from a borrow, it will take ownership of the borrow while the family is live
-    let mut delta = StateDelta::new(&mut tx);
-    delta.put_raw("delta".to_owned(), b"delta".to_vec());
-
-    // We can also nest StateDeltas -- unlike fork, this will only flatten down to the nesting point.
-    let mut d2 = StateDelta::new(&mut delta);
-
-    let mut delta_a = d2.fork();
-    let mut delta_b = d2.fork();
-    delta_a.put_raw("delta".to_owned(), b"delta_a".to_vec());
-    delta_b.put_raw("delta".to_owned(), b"delta_b".to_vec());
-    let mut delta_a_base = delta_a.fork();
-    let mut delta_b_base = delta_b.fork();
-    delta_a_base.delete("base".to_owned());
-    delta_b_base.delete("base".to_owned());
-
-    assert_eq!(delta_a.get_raw("base").await?, Some(b"base".to_vec()));
-    assert_eq!(delta_a.get_raw("base").await?, Some(b"base".to_vec()));
-    assert_eq!(delta_a_base.get_raw("base").await?, None);
-    assert_eq!(delta_b_base.get_raw("base").await?, None);
-
-    assert_eq!(delta_a.get_raw("delta").await?, Some(b"delta_a".to_vec()));
-    assert_eq!(
-        delta_a_base.get_raw("delta").await?,
-        Some(b"delta_a".to_vec())
-    );
-    assert_eq!(delta_b.get_raw("delta").await?, Some(b"delta_b".to_vec()));
-    assert_eq!(
-        delta_b_base.get_raw("delta").await?,
-        Some(b"delta_b".to_vec())
-    );
-
-    // Pick one we like and apply it, releasing the &mut delta reference...
-    // Note: flattens delta_b_base -> delta_b -> delta and stops!
-    delta_b_base.apply();
-    // ... so we can read from delta again.
-    assert_eq!(delta.get_raw("base").await?, None);
-    assert_eq!(delta.get_raw("delta").await?, Some(b"delta_b".to_vec()));
-
-    delta.apply();
-    tx.apply();
-    storage.commit(state).await?;
-
-    let state = storage.latest_snapshot();
-    assert_eq!(state.get_raw("base").await?, None);
-    assert_eq!(state.get_raw("delta").await?, Some(b"delta_b".to_vec()));
-
-    Ok(())
-}
-
-#[tokio::test]
-async fn simple_flow() -> anyhow::Result<()> {
-    //tracing_subscriber::fmt::init();
-    let tmpdir = tempfile::tempdir()?;
-
-    // Initialize an empty Storage in the new directory
-    let storage = Storage::load(tmpdir.path().to_owned()).await?;
-
-    // Version -1 to Version 0 writes
-    //
-    // tx00: test => test
-    // tx00: c/aa => 0 [object store]
-    // tx00: c/ab => 1 [object store]
-    // tx00: c/ac => 2 [object store]
-    // tx00: c/ad => 3 [object store]
-    // tx00: iA => A [nonverifiable store]
-    // tx00: iC => C [nonverifiable store]
-    // tx00: iF => F [nonverifiable store]
-    // tx00: iD => D [nonverifiable store]
-    // tx01: a/aa => aa
-    // tx01: a/aaa => aaa
-    // tx01: a/ab => ab
-    // tx01: a/z  => z
-    // tx01: c/ab => 10 [object store]
-    // tx01: c/ac => [deleted] [object store]
-    //
-    // Version 0 to Version 1 writes
-    // tx10: test => [deleted]
-    // tx10: a/aaa => [deleted]
-    // tx10: a/c => c
-    // tx10: iB => B [nonverifiable store]
-    // tx11: a/ab => ab2
-    // tx11: iD => [deleted] nonverifiable store]
-
-    let mut state_init = StateDelta::new(storage.latest_snapshot());
-    // Check that reads on an empty state return Ok(None)
-    assert_eq!(state_init.get_raw("test").await?, None);
-    assert_eq!(state_init.get_raw("a/aa").await?, None);
-
-    // Create tx00
-    let mut tx00 = StateDelta::new(&mut state_init);
-    tx00.put_raw("test".to_owned(), b"test".to_vec());
-    tx00.object_put("c/aa", 0u64);
-    tx00.object_put("c/ab", 1u64);
-    tx00.object_put("c/ac", 2u64);
-    tx00.object_put("c/ad", 3u64);
-    tx00.nonverifiable_put_raw(b"iA".to_vec(), b"A".to_vec());
-    tx00.nonverifiable_put_raw(b"iC".to_vec(), b"C".to_vec());
-    tx00.nonverifiable_put_raw(b"iF".to_vec(), b"F".to_vec());
-    tx00.nonverifiable_put_raw(b"iD".to_vec(), b"D".to_vec());
-
-    // Check reads against tx00:
-    //     This is present in tx00
-    assert_eq!(tx00.get_raw("test").await?, Some(b"test".to_vec()));
-    //     This is missing in tx00 and state_init and tree is empty
-    assert_eq!(tx00.get_raw("a/aa").await?, None);
-    //     Present in tx00 object store
-    assert_eq!(tx00.object_get("c/aa"), Some(0u64));
-    assert_eq!(tx00.object_get("c/ab"), Some(1u64));
-    assert_eq!(tx00.object_get("c/ac"), Some(2u64));
-    assert_eq!(tx00.object_get("c/ad"), Some(3u64));
-    //     Present in tx00 object store but requested with wrong type
-    assert_eq!(tx00.object_get::<bool>("c/aa"), None);
-    //     Missing in tx00 object store
-    assert_eq!(tx00.object_get::<bool>("nonexist"), None);
-    //     Nonconsensus range checks
-    let mut range = tx00.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"D".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Now apply the transaction to state_init
-    tx00.apply();
-    assert_eq!(state_init.get_raw("test").await?, Some(b"test".to_vec()));
-    assert_eq!(state_init.get_raw("a/aa").await?, None);
-    //     Present in state_init object store
-    assert_eq!(state_init.object_get("c/aa"), Some(0u64));
-    assert_eq!(state_init.object_get("c/ab"), Some(1u64));
-    assert_eq!(state_init.object_get("c/ac"), Some(2u64));
-    assert_eq!(state_init.object_get("c/ad"), Some(3u64));
-    //     Present in state_init object store but requested with wrong type
-    assert_eq!(state_init.object_get::<bool>("c/aa"), None);
-    //     Missing in state_init object store
-    assert_eq!(state_init.object_get::<bool>("nonexist"), None);
-    //     Nonconsensus range checks
-    let mut range = state_init.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"D".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Create a transaction writing the other keys.
-    let mut tx01 = StateDelta::new(&mut state_init);
-    tx01.put_raw("a/aa".to_owned(), b"aa".to_vec());
-    tx01.put_raw("a/aaa".to_owned(), b"aaa".to_vec());
-    tx01.put_raw("a/ab".to_owned(), b"ab".to_vec());
-    tx01.put_raw("a/z".to_owned(), b"z".to_vec());
-    tx01.object_put("c/ab", 10u64);
-    tx01.object_delete("c/ac");
-
-    // Check reads against tx01:
-    //    This is missing in tx01 and reads through to state_init
-    assert_eq!(tx01.get_raw("test").await?, Some(b"test".to_vec()));
-    //    This is present in tx01
-    assert_eq!(tx01.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(tx01.get_raw("a/aaa").await?, Some(b"aaa".to_vec()));
-    assert_eq!(tx01.get_raw("a/ab").await?, Some(b"ab".to_vec()));
-    assert_eq!(tx01.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is missing in tx01 and in state_init
-    assert_eq!(tx01.get_raw("a/c").await?, None);
-    let mut range = tx01.prefix_raw("a/");
-    let mut range_keys = tx01.prefix_keys("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range_keys.next().await.transpose()?,
-        Some("a/aa".to_owned())
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aaa".to_owned(), b"aaa".to_vec()))
-    );
-    assert_eq!(
-        range_keys.next().await.transpose()?,
-        Some("a/aaa".to_owned())
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab".to_vec()))
-    );
-    assert_eq!(
-        range_keys.next().await.transpose()?,
-        Some("a/ab".to_owned())
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range_keys.next().await.transpose()?, Some("a/z".to_owned()));
-    assert_eq!(range.next().await.transpose()?, None);
-    assert_eq!(range_keys.next().await.transpose()?, None);
-    std::mem::drop(range);
-    std::mem::drop(range_keys);
-
-    // Now apply the transaction to state_init
-    tx01.apply();
-
-    // Check reads against state_init:
-    //    This is present in state_init
-    assert_eq!(state_init.get_raw("test").await?, Some(b"test".to_vec()));
-    assert_eq!(state_init.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state_init.get_raw("a/aaa").await?, Some(b"aaa".to_vec()));
-    assert_eq!(state_init.get_raw("a/ab").await?, Some(b"ab".to_vec()));
-    assert_eq!(state_init.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is missing in state_init
-    assert_eq!(state_init.get_raw("a/c").await?, None);
-    let mut range = state_init.prefix_raw("a/");
-    let mut range_keys = state_init.prefix_keys("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range_keys.next().await.transpose()?,
-        Some("a/aa".to_owned())
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aaa".to_owned(), b"aaa".to_vec()))
-    );
-    assert_eq!(
-        range_keys.next().await.transpose()?,
-        Some("a/aaa".to_owned())
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab".to_vec()))
-    );
-    assert_eq!(
-        range_keys.next().await.transpose()?,
-        Some("a/ab".to_owned())
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range_keys.next().await.transpose()?, Some("a/z".to_owned()));
-    assert_eq!(range.next().await.transpose()?, None);
-    assert_eq!(range_keys.next().await.transpose()?, None);
-    std::mem::drop(range);
-    std::mem::drop(range_keys);
-
-    // Now commit state_init to storage
-    storage.commit_delta(state_init).await?;
-
-    // Now we have version 0.
-    let mut state0 = StateDelta::new(storage.latest_snapshot());
-    //assert_eq!(state0.version(), 0);
-    // Check reads against state0:
-    //    This is missing in state0 and present in JMT
-    assert_eq!(state0.get_raw("test").await?, Some(b"test".to_vec()));
-    assert_eq!(state0.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state0.get_raw("a/aaa").await?, Some(b"aaa".to_vec()));
-    assert_eq!(state0.get_raw("a/ab").await?, Some(b"ab".to_vec()));
-    assert_eq!(state0.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is missing in state0 and missing in JMT
-    assert_eq!(state0.get_raw("a/c").await?, None);
-    let mut range = state0.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aaa".to_owned(), b"aaa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    //     Nonconsensus range checks
-    let mut range = state0.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"D".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Start building a transaction
-    let mut tx10 = StateDelta::new(&mut state0);
-    tx10.delete("test".to_owned());
-    tx10.delete("a/aaa".to_owned());
-    tx10.put_raw("a/c".to_owned(), b"c".to_vec());
-    tx10.nonverifiable_put_raw(b"iB".to_vec(), b"B".to_vec());
-
-    // Check reads against tx10:
-    //    This is deleted in tx10, missing in state0, present in JMT
-    assert_eq!(tx10.get_raw("test").await?, None);
-    assert_eq!(tx10.get_raw("a/aaa").await?, None);
-    //    This is missing in tx10, missing in state0, present in JMT
-    assert_eq!(tx10.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(tx10.get_raw("a/ab").await?, Some(b"ab".to_vec()));
-    assert_eq!(tx10.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is present in tx10, missing in state0, missing in JMT
-    assert_eq!(tx10.get_raw("a/c").await?, Some(b"c".to_vec()));
-    let mut range = tx10.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/c".to_owned(), b"c".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    //     Nonconsensus range checks
-    let mut range = tx10.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"D".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Apply tx10 to state0
-    tx10.apply();
-
-    // Check reads against state0
-    //    This is deleted in state0, present in JMT
-    assert_eq!(state0.get_raw("test").await?, None);
-    assert_eq!(state0.get_raw("a/aaa").await?, None);
-    //    This is missing in state0, present in JMT
-    assert_eq!(state0.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state0.get_raw("a/ab").await?, Some(b"ab".to_vec()));
-    assert_eq!(state0.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is present in state0, missing in JMT
-    assert_eq!(state0.get_raw("a/c").await?, Some(b"c".to_vec()));
-    let mut range = state0.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/c".to_owned(), b"c".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Start building another transaction
-    let mut tx11 = StateDelta::new(&mut state0);
-    tx11.put_raw("a/ab".to_owned(), b"ab2".to_vec());
-    tx11.nonverifiable_delete(b"iD".to_vec());
-
-    // Check reads against tx11:
-    //    This is present in tx11, missing in state0, present in JMT
-    assert_eq!(tx11.get_raw("a/ab").await?, Some(b"ab2".to_vec()));
-    //    This is missing in tx11, deleted in state0, present in JMT
-    assert_eq!(tx11.get_raw("test").await?, None);
-    assert_eq!(tx11.get_raw("a/aaa").await?, None);
-    //    This is missing in tx11, missing in state0, present in JMT
-    assert_eq!(tx11.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(tx11.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is missing in tx10, present in state0, missing in JMT
-    assert_eq!(tx11.get_raw("a/c").await?, Some(b"c".to_vec()));
-    let mut range = tx11.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab2".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/c".to_owned(), b"c".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    //     Nonconsensus range checks
-    let mut range = tx11.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Apply tx11 to state0
-    tx11.apply();
-
-    // Check reads against state0
-    //    This is deleted in state0, present in JMT
-    assert_eq!(state0.get_raw("test").await?, None);
-    assert_eq!(state0.get_raw("a/aaa").await?, None);
-    //    This is missing in state0, present in JMT
-    assert_eq!(state0.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state0.get_raw("a/z").await?, Some(b"z".to_vec()));
-    //    This is present in state0, missing in JMT
-    assert_eq!(state0.get_raw("a/c").await?, Some(b"c".to_vec()));
-    //    This is present in state0, present in JMT
-    assert_eq!(state0.get_raw("a/ab").await?, Some(b"ab2".to_vec()));
-    let mut range = state0.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab2".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/c".to_owned(), b"c".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    let mut range = state0.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Create another fork of state 0 while we've edited the first one but before we commit.
-    let state0a = storage.latest_snapshot();
-    assert_eq!(state0a.version(), 0);
-
-    // Commit state0 as state1.
-    storage.commit_delta(state0).await?;
-
-    let state1 = storage.latest_snapshot();
-    assert_eq!(state1.version(), 1);
-
-    // Check reads against state1
-    assert_eq!(state1.get_raw("test").await?, None);
-    assert_eq!(state1.get_raw("a/aaa").await?, None);
-    assert_eq!(state1.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state1.get_raw("a/ab").await?, Some(b"ab2".to_vec()));
-    assert_eq!(state1.get_raw("a/z").await?, Some(b"z".to_vec()));
-    assert_eq!(state1.get_raw("a/c").await?, Some(b"c".to_vec()));
-    let mut range = state1.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab2".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/c".to_owned(), b"c".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    let mut range = state1.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Check reads against state0a
-    assert_eq!(state0a.get_raw("test").await?, Some(b"test".to_vec()));
-    assert_eq!(state0a.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state0a.get_raw("a/aaa").await?, Some(b"aaa".to_vec()));
-    assert_eq!(state0a.get_raw("a/ab").await?, Some(b"ab".to_vec()));
-    assert_eq!(state0a.get_raw("a/z").await?, Some(b"z".to_vec()));
-    assert_eq!(state0a.get_raw("a/c").await?, None);
-    let mut range = state0a.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aaa".to_owned(), b"aaa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    //     Nonconsensus range checks
-    let mut range = state0a.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iD".to_vec(), b"D".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    // Now, check that closing and reloading works.
-
-    // First, be sure to explicitly drop anything keeping a reference to the
-    // RocksDB instance:
-    std::mem::drop(storage);
-    // std::mem::drop(state0); // consumed in commit()
-    std::mem::drop(state0a);
-    std::mem::drop(state1);
-
-    // Now reload the storage from the same directory...
-    let storage_a = Storage::load(tmpdir.path().to_owned()).await?;
-    let state1a = storage_a.latest_snapshot();
-
-    // Check that we reload at the correct version ...
-    assert_eq!(state1a.version(), 1);
-
-    // Check reads against state1a after reloading the DB
-    assert_eq!(state1a.get_raw("test").await?, None);
-    assert_eq!(state1a.get_raw("a/aaa").await?, None);
-    assert_eq!(state1a.get_raw("a/aa").await?, Some(b"aa".to_vec()));
-    assert_eq!(state1a.get_raw("a/ab").await?, Some(b"ab2".to_vec()));
-    assert_eq!(state1a.get_raw("a/z").await?, Some(b"z".to_vec()));
-    assert_eq!(state1a.get_raw("a/c").await?, Some(b"c".to_vec()));
-    let mut range = state1a.prefix_raw("a/");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/aa".to_owned(), b"aa".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/ab".to_owned(), b"ab2".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/c".to_owned(), b"c".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some(("a/z".to_owned(), b"z".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-    //     Nonconsensus range checks
-    let mut range = state1a.nonverifiable_prefix_raw(b"i");
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iA".to_vec(), b"A".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iB".to_vec(), b"B".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iC".to_vec(), b"C".to_vec()))
-    );
-    assert_eq!(
-        range.next().await.transpose()?,
-        Some((b"iF".to_vec(), b"F".to_vec()))
-    );
-    assert_eq!(range.next().await.transpose()?, None);
-    std::mem::drop(range);
-
-    Ok(())
-}
-
- */
diff --git a/crates/cnidarium/src/utils.rs b/crates/cnidarium/src/utils.rs
deleted file mode 100644
index 0d04841c71..0000000000
--- a/crates/cnidarium/src/utils.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use anyhow::bail;
-/// Splits a range into a tuple of start and end bounds, ignoring the inclusive/exclusive
-/// nature of the range bounds. And returns a tuple consisting of the range implementation,
-/// and the start and end bounds.
-/// # Errors
-/// This method returns an error when the range is inclusive on the end bound,
-/// and when the lower bound is greater than the upper bound.
-#[allow(clippy::type_complexity)]
-pub(crate) fn convert_bounds(
-    range: impl std::ops::RangeBounds<Vec<u8>>,
-) -> anyhow::Result<(
-    impl std::ops::RangeBounds<Vec<u8>>,
-    (Option<Vec<u8>>, Option<Vec<u8>>),
-)> {
-    let start = match range.start_bound() {
-        std::ops::Bound::Included(v) => Some(v.clone()),
-        std::ops::Bound::Excluded(v) => Some(v.clone()),
-        std::ops::Bound::Unbounded => None,
-    };
-
-    let end = match range.end_bound() {
-        std::ops::Bound::Included(_) => bail!("included end bound not supported"),
-        std::ops::Bound::Excluded(v) => Some(v.clone()),
-        std::ops::Bound::Unbounded => None,
-    };
-
-    if let (Some(k_start), Some(k_end)) = (&start, &end) {
-        if k_start > k_end {
-            bail!("lower bound is greater than upper bound")
-        }
-    }
-
-    Ok((range, (start, end)))
-}
diff --git a/crates/cnidarium/src/write.rs b/crates/cnidarium/src/write.rs
deleted file mode 100644
index ee461c3698..0000000000
--- a/crates/cnidarium/src/write.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use crate::StateRead;
-use std::{any::Any, collections::BTreeMap};
-use tendermint::abci;
-
-/// Write access to chain state.
-pub trait StateWrite: StateRead + Send + Sync {
-    /// Puts raw bytes into the verifiable key-value store with the given key.
-    fn put_raw(&mut self, key: String, value: Vec<u8>);
-
-    /// Delete a key from the verifiable key-value store.
-    fn delete(&mut self, key: String);
-
-    /// Puts raw bytes into the non-verifiable key-value store with the given key.
-    fn nonverifiable_put_raw(&mut self, key: Vec<u8>, value: Vec<u8>);
-
-    /// Delete a key from non-verifiable key-value storage.
-    fn nonverifiable_delete(&mut self, key: Vec<u8>);
-
-    /// Puts an object into the ephemeral object store with the given key.
-    ///
-    /// # Panics
-    ///
-    /// If the object is already present in the store, but its type is not the same as the type of
-    /// `value`.
-    fn object_put<T: Clone + Any + Send + Sync>(&mut self, key: &'static str, value: T);
-
-    /// Deletes a key from the ephemeral object store.
-    fn object_delete(&mut self, key: &'static str);
-
-    /// Merge a set of object changes into this `StateWrite`.
-    ///
-    /// Unlike `object_put`, this avoids re-boxing values and messing up the downcasting.
-    fn object_merge(&mut self, objects: BTreeMap<&'static str, Option<Box<dyn Any + Send + Sync>>>);
-
-    /// Record that an ABCI event occurred while building up this set of state changes.
-    fn record(&mut self, event: abci::Event);
-}
-
-impl<'a, S: StateWrite + Send + Sync> StateWrite for &'a mut S {
-    fn put_raw(&mut self, key: String, value: jmt::OwnedValue) {
-        (**self).put_raw(key, value)
-    }
-
-    fn delete(&mut self, key: String) {
-        (**self).delete(key)
-    }
-
-    fn nonverifiable_delete(&mut self, key: Vec<u8>) {
-        (**self).nonverifiable_delete(key)
-    }
-
-    fn nonverifiable_put_raw(&mut self, key: Vec<u8>, value: Vec<u8>) {
-        (**self).nonverifiable_put_raw(key, value)
-    }
-
-    fn object_put<T: Clone + Any + Send + Sync>(&mut self, key: &'static str, value: T) {
-        (**self).object_put(key, value)
-    }
-
-    fn object_delete(&mut self, key: &'static str) {
-        (**self).object_delete(key)
-    }
-
-    fn object_merge(
-        &mut self,
-        objects: BTreeMap<&'static str, Option<Box<dyn Any + Send + Sync>>>,
-    ) {
-        (**self).object_merge(objects)
-    }
-
-    fn record(&mut self, event: abci::Event) {
-        (**self).record(event)
-    }
-}
diff --git a/crates/cnidarium/src/write_batch.rs b/crates/cnidarium/src/write_batch.rs
deleted file mode 100644
index db86077898..0000000000
--- a/crates/cnidarium/src/write_batch.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use std::sync::Arc;
-
-// HashMap is okay here because we don't care about ordering of substore roots.
-use std::collections::HashMap;
-
-use crate::{
-    cache::Cache,
-    store::{multistore, substore::SubstoreConfig},
-    RootHash,
-};
-
-/// A staged write batch that can be committed to RocksDB.
-///
-/// This allows for write batches to be prepared and committed at a later time.
-pub struct StagedWriteBatch {
-    /// The write batch to commit to RocksDB.
-    pub(crate) write_batch: rocksdb::WriteBatch,
-    /// The new version of the chain state.
-    pub(crate) version: jmt::Version,
-    /// The new versions of each substore.
-    pub(crate) multistore_versions: multistore::MultistoreCache,
-    /// The root hash of the chain state corresponding to this set of changes.
-    pub(crate) root_hash: RootHash,
-    /// The configs, root hashes, and new versions of each substore
-    /// that was updated in this batch.
-    #[allow(clippy::disallowed_types)]
-    pub(crate) substore_roots: HashMap<Arc<SubstoreConfig>, (RootHash, u64)>,
-    /// Whether or not to perform a migration.
-    pub(crate) perform_migration: bool,
-    /// A lightweight copy of the changeset, this is useful to provide
-    /// a stream of changes to subscribers.
-    pub(crate) changes: Arc<Cache>,
-}
-
-impl StagedWriteBatch {
-    /// Returns the new version of the chain state corresponding to this set of changes.
-    pub fn version(&self) -> jmt::Version {
-        self.version
-    }
-
-    /// Returns the root hash of the jmt corresponding to this set of changes.
-    pub fn root_hash(&self) -> &RootHash {
-        &self.root_hash
-    }
-
-    /// Returns the version of a substore in this batch, if it exists
-    /// and `None` otherwise.
-    pub fn substore_version(&self, prefix: &str) -> Option<jmt::Version> {
-        let Some(substore_config) = self
-            .multistore_versions
-            .config
-            .find_substore(prefix.as_bytes())
-        else {
-            return None;
-        };
-
-        self.multistore_versions.get_version(&substore_config)
-    }
-}
diff --git a/crates/cnidarium/tests/migration.rs b/crates/cnidarium/tests/migration.rs
deleted file mode 100644
index 231493357f..0000000000
--- a/crates/cnidarium/tests/migration.rs
+++ /dev/null
@@ -1,1190 +0,0 @@
-#![cfg(feature = "migration")]
-use cnidarium::StateDelta;
-use cnidarium::StateWrite;
-use cnidarium::Storage;
-use ibc_types::core::commitment::MerklePath;
-use ibc_types::core::commitment::MerkleRoot;
-use jmt::RootHash;
-use once_cell::sync::Lazy;
-use tempfile;
-use tokio;
-
-/*
- * Migration tests.
- *
- * Node operators perform network upgrades by running a migration of
- * the chain state that preserve block height continuity. In order to
- * enable this, we need to have a way to commit changes to our merkle
- * tree, _without_ increasing its version number.
- *
- * With the addition of substores, we must cover the cases when migrations
- * accesses data located in substores.
- *
- * These integration tests enforce that a migration operation is able to
- * write to both the main store and any number of substores without incrementing
- * their version number.
- *
- * Testing menu:
- * - test_simple_migration: the most basic migration scenario where we write to the main store.
- * - test_substore_migration: a migration scenario where we write to the main store and substores.
- * - prop_test_substore_migration: property-based testing of the migration operation.
- *
- * Each test has the following pattern:
- * Operation:
- *              Write a collection of keys, incrementing the version number at each step.
- * Checks:
- * - Check that the version number has incremented.
- * - Check that the keys are present in the latest snapshot.
- * - Check that the keys have valid proofs.
- * Operation:
- *              Perform a migration, writing/removing a key in the main store and/or substores.
- * - Check that the version number has not changed.
- * - Check that the root hash for the main store and/or substores has changed.
- * - Check that the migration key is present in the latest snapshot.
- * - Check that the migration key has a valid proof.
- * - Check that the migration key has the expected value.
- * Operation:
- *              Write a new collection of keys, incrementing the version number at each step.
- * Checks:
- * - Check that the version number has incremented.
- * - Check that the new keys are present in the latest snapshot.
- * - Check that the new keys have valid proofs.
- * - Check that the new keys have the expected values.
- * Operation:
- *              Try to generate proofs for keys that are NOT present in the jmt
- * Checks:
- * - Check that no value is returned for the keys.
- * - Check that the nonexistence proofs are valid.
- */
-
-/// The proof specs for the main store.
-pub static MAIN_STORE_PROOF_SPEC: Lazy<Vec<ics23::ProofSpec>> =
-    Lazy::new(|| vec![cnidarium::ics23_spec()]);
-
-/// The proof specs for keys located in substores (e.g. `ibc` keys)
-pub static FULL_PROOF_SPECS: Lazy<Vec<ics23::ProofSpec>> =
-    Lazy::new(|| vec![cnidarium::ics23_spec(), cnidarium::ics23_spec()]);
-
-#[tokio::test]
-/// Test that we can commit to the main store without incrementing its version.
-async fn test_simple_migration() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-    let db_path = tmpdir.into_path();
-    let substore_prefixes = vec![];
-    let storage = Storage::load(db_path.clone(), substore_prefixes.clone()).await?;
-
-    let mut counter = 0;
-    let num_ops = 10;
-
-    /* ************************ */
-    /*      write some keys     */
-    /* ************************ */
-    let mut kvs = vec![];
-    for i in 0..num_ops {
-        /* write some value at version `i` */
-        let mut delta = StateDelta::new(storage.latest_snapshot());
-        let key = format!("key_{i}");
-        let value = format!("value_{i}").as_bytes().to_vec();
-        delta.put_raw(key.clone(), value.clone());
-        let root_hash = storage.commit(delta).await?;
-
-        tracing::info!(%key, ?root_hash, version = %i, "committed key-value pair");
-
-        kvs.push((key, value));
-        counter += 1;
-    }
-
-    assert_eq!(counter, num_ops);
-    counter = 0;
-
-    // We don't _need_ to toss the storage instance, but let's be
-    // extra careful and make sure that we can load the storage.
-    storage.release().await;
-    let storage = Storage::load(db_path.clone(), substore_prefixes.clone()).await?;
-    let premigration_root = storage
-        .latest_snapshot()
-        .root_hash()
-        .await
-        .expect("infallible");
-
-    for (i, (key, value)) in kvs.clone().into_iter().enumerate() {
-        let snapshot = storage.latest_snapshot();
-        let (some_value, proof) = snapshot.get_with_proof(key.as_bytes().to_vec()).await?;
-        let retrieved_value = some_value.expect("key is found in the latest snapshot");
-        assert_eq!(retrieved_value, value);
-
-        let merkle_path = MerklePath {
-            key_path: vec![key],
-        };
-        let merkle_root = MerkleRoot {
-            hash: premigration_root.0.to_vec(),
-        };
-
-        proof
-            .verify_membership(
-                &MAIN_STORE_PROOF_SPEC,
-                merkle_root,
-                merkle_path,
-                retrieved_value,
-                0,
-            )
-            .map_err(|e| tracing::error!(?e, key_index = ?i, "proof verification failed"))
-            .expect("membership proof verifies");
-
-        counter += 1;
-    }
-
-    assert_eq!(counter, num_ops);
-    counter = 0;
-
-    let old_version = storage.latest_version();
-    assert_eq!(old_version, num_ops - 1);
-
-    /* ********************* */
-    /* perform the migration */
-    /* ********************* */
-    let mut delta = StateDelta::new(storage.latest_snapshot());
-    let migration_key = "banana".to_string();
-    let migration_value = "a good fruit".as_bytes().to_vec();
-    delta.put_raw(migration_key.clone(), migration_value.clone());
-    let postmigration_root = storage.commit_in_place(delta).await?;
-
-    // We have to reload the storage instance to get the latest snapshot.
-    storage.release().await;
-    let storage = Storage::load(db_path, substore_prefixes).await?;
-
-    let new_version = storage.latest_version();
-
-    assert_ne!(
-        premigration_root, postmigration_root,
-        "migration should change the root hash"
-    );
-    assert_eq!(
-        old_version, new_version,
-        "the post-migration version number should not change"
-    );
-
-    /* ************************ */
-    /*   check the migration    */
-    /* ************************ */
-    let (some_value, proof) = storage
-        .latest_snapshot()
-        .get_with_proof(migration_key.as_bytes().to_vec())
-        .await?;
-    let retrieved_value = some_value.expect("migration key is found in the latest snapshot");
-    assert_eq!(retrieved_value, migration_value);
-
-    let merkle_path = MerklePath {
-        key_path: vec![migration_key],
-    };
-    let merkle_root = MerkleRoot {
-        hash: postmigration_root.0.to_vec(),
-    };
-
-    proof
-        .verify_membership(
-            &MAIN_STORE_PROOF_SPEC,
-            merkle_root,
-            merkle_path,
-            retrieved_value,
-            0,
-        )
-        .map_err(|e| tracing::error!("proof verification failed: {:?}", e))
-        .expect("membership proof verifies");
-
-    /* ************************ */
-    /*      write new keys      */
-    /* ************************ */
-    for i in num_ops..num_ops * 2 {
-        /* write some value at version `i` */
-        let mut delta = StateDelta::new(storage.latest_snapshot());
-        let key = format!("key_{i}");
-        let value = format!("value_{i}").as_bytes().to_vec();
-        delta.put_raw(key.clone(), value.clone());
-        let root_hash = storage.commit(delta).await?;
-
-        tracing::info!(%key, ?root_hash, version = %i, "committed key-value pair");
-
-        kvs.push((key, value));
-        counter += 1;
-    }
-
-    assert_eq!(counter, num_ops);
-    counter = 0;
-
-    let final_root = storage
-        .latest_snapshot()
-        .root_hash()
-        .await
-        .expect("infaillible");
-
-    for (i, (key, value)) in kvs.clone().into_iter().enumerate() {
-        let snapshot = storage.latest_snapshot();
-        let (some_value, proof) = snapshot.get_with_proof(key.as_bytes().to_vec()).await?;
-        let retrieved_value = some_value.expect("key is found in the latest snapshot");
-        assert_eq!(retrieved_value, value);
-
-        let merkle_path = MerklePath {
-            key_path: vec![key],
-        };
-        let merkle_root = MerkleRoot {
-            hash: final_root.0.to_vec(),
-        };
-
-        proof
-            .verify_membership(
-                &MAIN_STORE_PROOF_SPEC,
-                merkle_root,
-                merkle_path,
-                retrieved_value,
-                0,
-            )
-            .map_err(|e| tracing::error!(?e, key_index = ?i, "proof verification failed"))
-            .expect("membership proof verifies");
-
-        counter += 1;
-    }
-
-    assert_eq!(counter, num_ops * 2);
-
-    /* ****************************** */
-    /*      read nonexistent keys     */
-    /* ****************************** */
-    let final_snapshot = storage.latest_snapshot();
-    let final_root = final_snapshot.root_hash().await.expect("infaillible");
-
-    let key = format!("nonexistent_key");
-    let (some_value, proof) = final_snapshot
-        .get_with_proof(key.as_bytes().to_vec())
-        .await?;
-    assert!(some_value.is_none());
-    let merkle_path = MerklePath {
-        key_path: vec![key],
-    };
-    let merkle_root = MerkleRoot {
-        hash: final_root.0.to_vec(),
-    };
-
-    proof
-        .verify_non_membership(&MAIN_STORE_PROOF_SPEC, merkle_root, merkle_path)
-        .map_err(|e| tracing::error!("proof verification failed: {:?}", e))
-        .expect("nonmembership proof verifies");
-
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that we can commit to substores without incrementing their version.
-async fn test_substore_migration() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-    let db_path = tmpdir.into_path();
-    let substore_prefixes = vec!["ibc".to_string(), "dex".to_string(), "misc".to_string()];
-    let storage = Storage::load(db_path.clone(), substore_prefixes.clone()).await?;
-
-    let mut counter = 0;
-    let num_ops_per_substore = 10;
-
-    let mut kvs = vec![];
-
-    /* ************************ */
-    /*      write some keys     */
-    /*     in every substore    */
-    /* ************************ */
-    for i in 0..num_ops_per_substore {
-        let mut delta = StateDelta::new(storage.latest_snapshot());
-        for substore in substore_prefixes.iter() {
-            let key = format!("{substore}/key_{i}");
-            let value = format!("{substore}value_{i}").as_bytes().to_vec();
-            kvs.push((key.clone(), value.clone()));
-            tracing::debug!(?key, "initializing substore {substore} with key-value pair");
-            delta.put_raw(key.clone(), value.clone());
-        }
-
-        let root_hash = storage.commit(delta).await?;
-        tracing::info!(?root_hash, version = %i, "committed key-value pair");
-        counter += 1;
-    }
-    let num_versions_pre_migration = counter;
-    assert_eq!(counter, num_ops_per_substore);
-    counter = 0;
-
-    // We don't _need_ to toss the storage instance, but let's be
-    // extra careful and make sure that things work if we reload it.
-    storage.release().await;
-    let storage = Storage::load(db_path.clone(), substore_prefixes.clone()).await?;
-
-    let premigration_root = storage
-        .latest_snapshot()
-        .root_hash()
-        .await
-        .expect("infaillible");
-
-    for (i, (key, value)) in kvs.clone().into_iter().enumerate() {
-        tracing::debug!(?key, "checking key-value pair");
-        let snapshot = storage.latest_snapshot();
-        let (some_value, proof) = snapshot.get_with_proof(key.as_bytes().to_vec()).await?;
-        let retrieved_value = some_value.expect("key is found in the latest snapshot");
-        assert_eq!(retrieved_value, value);
-
-        // We split the key into its substore prefix and the key itself.
-        let merkle_path = MerklePath {
-            key_path: key.split('/').map(|s| s.to_string()).collect(),
-        };
-        let merkle_root = MerkleRoot {
-            hash: premigration_root.0.to_vec(),
-        };
-
-        proof
-            .verify_membership(
-                &FULL_PROOF_SPECS,
-                merkle_root,
-                merkle_path,
-                retrieved_value,
-                0,
-            )
-            .map_err(|e| tracing::error!(?e, key_index = ?i, "proof verification failed"))
-            .expect("membership proof verifies");
-
-        counter += 1;
-    }
-
-    assert_eq!(
-        counter,
-        substore_prefixes.len() as u64 * num_ops_per_substore
-    );
-
-    let premigration_snapshot = storage.latest_snapshot();
-    let mut old_root_hashes: Vec<RootHash> = vec![];
-    for substore in substore_prefixes.iter() {
-        let root_hash = premigration_snapshot
-            .prefix_root_hash(substore.as_str())
-            .await
-            .expect("prefix exists");
-        old_root_hashes.push(root_hash);
-    }
-
-    let old_substore_versions: Vec<jmt::Version> = substore_prefixes
-        .clone()
-        .into_iter()
-        .map(|prefix| {
-            let old_version = premigration_snapshot
-                .prefix_version(prefix.as_str())
-                .expect("prefix exists");
-            old_version.expect("substore is initialized")
-        })
-        .collect();
-
-    let old_version = storage.latest_version();
-    assert_eq!(old_version, num_versions_pre_migration - 1); // -1 because we start at u64::MAX
-    let premigration_root_hash = premigration_snapshot
-        .root_hash()
-        .await
-        .expect("infaillible");
-    drop(premigration_snapshot);
-
-    /* ******************************* */
-    /*      perform the migration      */
-    /* (write a key in every substore) */
-    /* ******************************* */
-    let mut delta = StateDelta::new(storage.latest_snapshot());
-    let mut migration_kvs = vec![];
-
-    // Start by writing a key in every substore, including the main store.
-    for substore in substore_prefixes.iter() {
-        let key = format!("{substore}/banana", substore = substore);
-        let value = format!("{substore}", substore = substore)
-            .as_bytes()
-            .to_vec();
-        tracing::debug!(?key, "migration: writing to substore {substore}");
-        delta.put_raw(key.clone(), value.clone());
-        migration_kvs.push((key, value));
-    }
-
-    // Commit the migration.
-    let _ = storage.commit_in_place(delta).await?;
-
-    /* ************************ */
-    /*   check the migration    */
-    /* ************************ */
-    // Overview: We just wrote a key in every substore. Now we want to perform increasingly
-    // complex checks to ensure that the migration was successful.
-    // 1. Check that every root hash has changed
-    // 2. Check that no version number has changed
-    // 3. Check that we can read the migration key from every substore
-    // 4. Check that the migration key has a valid proof
-    // 5. Check that we can read every other key from every substore
-    // 6. Check that every other key has a valid proof
-
-    // We reload storage so that we can access the latest snapshot.
-    // The snapshot cache is not updated when we commit in place.
-    storage.release().await;
-    let storage = Storage::load(db_path.clone(), substore_prefixes.clone()).await?;
-
-    let postmigration_snapshot = storage.latest_snapshot();
-    let new_version = storage.latest_version();
-
-    assert_eq!(
-        old_version, new_version,
-        "the global version should not change"
-    );
-
-    let postmigration_root_hash = postmigration_snapshot
-        .root_hash()
-        .await
-        .expect("infaillible");
-
-    assert_ne!(premigration_root_hash, postmigration_root_hash);
-
-    // Check that the root hash for every substore has changed.
-    let mut new_root_hashes: Vec<RootHash> = vec![];
-    for substore in substore_prefixes.iter() {
-        let root_hash = postmigration_snapshot
-            .prefix_root_hash(substore.as_str())
-            .await
-            .expect("prefix exists");
-        new_root_hashes.push(root_hash);
-    }
-
-    old_root_hashes
-        .iter()
-        .zip(new_root_hashes.iter())
-        .zip(substore_prefixes.iter())
-        .for_each(|((old, new), substore)| {
-            assert_ne!(
-                old, new,
-                "migration did not effect the root hash for substore {substore}",
-            );
-            let substore_version = postmigration_snapshot
-                .prefix_version(substore.as_str())
-                .expect("prefix exists")
-                .unwrap();
-            assert_eq!(
-                substore_version,
-                num_ops_per_substore - 1,
-                "substore version should not change"
-            );
-        });
-
-    // Check that the version number for every substore has NOT changed.
-    let new_substore_versions: Vec<jmt::Version> = substore_prefixes
-        .clone()
-        .into_iter()
-        .map(|prefix| {
-            let new_version = postmigration_snapshot
-                .prefix_version(prefix.as_str())
-                .expect("prefix exists");
-            new_version.expect("substore is initialized")
-        })
-        .collect();
-
-    old_substore_versions
-        .iter()
-        .zip(new_substore_versions.iter())
-        .zip(substore_prefixes.iter())
-        .for_each(|((old, new), substore)| {
-            assert_eq!(
-                old, new,
-                "the version number for substore {substore} has changed!",
-            );
-        });
-
-    // Check that the migration key is present in the latest snapshot.
-    for (migration_key, migration_value) in migration_kvs.clone().into_iter() {
-        let (some_value, proof) = postmigration_snapshot
-            .get_with_proof(migration_key.as_bytes().to_vec())
-            .await?;
-        let retrieved_value = some_value.expect("migration key is found in the latest snapshot");
-        assert_eq!(retrieved_value, migration_value);
-
-        let merkle_path = MerklePath {
-            key_path: migration_key.split('/').map(|s| s.to_string()).collect(),
-        };
-        let merkle_root = MerkleRoot {
-            hash: postmigration_root_hash.0.to_vec(),
-        };
-
-        proof
-            .verify_membership(
-                &FULL_PROOF_SPECS,
-                merkle_root,
-                merkle_path,
-                retrieved_value,
-                0,
-            )
-            .map_err(|e| tracing::error!("proof verification failed: {:?}", e))
-            .expect("membership proof verifies");
-    }
-
-    // Check that every other key is still present in the latest snapshot.
-    for (key, value) in kvs.clone().into_iter() {
-        let (some_value, proof) = postmigration_snapshot
-            .get_with_proof(key.as_bytes().to_vec())
-            .await?;
-        let retrieved_value = some_value.expect("key is found in the latest snapshot");
-        assert_eq!(retrieved_value, value);
-
-        let merkle_path = MerklePath {
-            key_path: key.split('/').map(|s| s.to_string()).collect(),
-        };
-        let merkle_root = MerkleRoot {
-            hash: postmigration_root_hash.0.to_vec(),
-        };
-
-        proof
-            .verify_membership(
-                &FULL_PROOF_SPECS,
-                merkle_root,
-                merkle_path,
-                retrieved_value,
-                0,
-            )
-            .map_err(|e| tracing::error!("proof verification failed: {:?}", e))
-            .expect("membership proof verifies");
-    }
-
-    /* ************************ */
-    /*      write some keys     */
-    /*     in every substore    */
-    /*        ... again ...     */
-    /* ************************ */
-    counter = 0;
-    for i in 0..num_ops_per_substore {
-        let mut delta = StateDelta::new(storage.latest_snapshot());
-        for substore in substore_prefixes.iter() {
-            let key = format!("{substore}/key_{i}");
-            let value = format!("{substore}value_{i}").as_bytes().to_vec();
-            kvs.push((key.clone(), value.clone()));
-            tracing::debug!(?key, "initializing substore {substore} with key-value pair");
-            delta.put_raw(key.clone(), value.clone());
-        }
-
-        let root_hash = storage.commit(delta).await?;
-        tracing::info!(?root_hash, version = %i, "committed key-value pair");
-        counter += 1;
-    }
-    assert_eq!(counter, num_ops_per_substore);
-    counter = 0;
-
-    let final_root = storage
-        .latest_snapshot()
-        .root_hash()
-        .await
-        .expect("infaillible");
-
-    for (i, (key, value)) in kvs.clone().into_iter().enumerate() {
-        tracing::debug!(?key, "checking key-value pair");
-        let snapshot = storage.latest_snapshot();
-        let (some_value, proof) = snapshot.get_with_proof(key.as_bytes().to_vec()).await?;
-        let retrieved_value = some_value.expect("key is found in the latest snapshot");
-        assert_eq!(retrieved_value, value);
-
-        // We split the key into its substore prefix and the key itself.
-        let merkle_path = MerklePath {
-            key_path: key.split('/').map(|s| s.to_string()).collect(),
-        };
-        let merkle_root = MerkleRoot {
-            hash: final_root.0.to_vec(),
-        };
-
-        proof
-            .verify_membership(
-                &FULL_PROOF_SPECS,
-                merkle_root,
-                merkle_path,
-                retrieved_value,
-                0,
-            )
-            .map_err(|e| tracing::error!(?e, key_index = ?i, "proof verification failed"))
-            .expect("membership proof verifies");
-
-        counter += 1;
-    }
-
-    assert_eq!(
-        counter,
-        // For each substore, we wrote `num_ops_per_substore` keys twice.
-        substore_prefixes.len() as u64 * num_ops_per_substore * 2
-    );
-
-    /* ****************************** */
-    /*      read nonexistent keys     */
-    /* ****************************** */
-    for (idx, substore) in substore_prefixes.iter().enumerate() {
-        let key = format!("{substore}/nonexistent_key_{idx}");
-        let (some_value, proof) = postmigration_snapshot
-            .get_with_proof(key.as_bytes().to_vec())
-            .await?;
-        assert!(some_value.is_none());
-        let merkle_path = MerklePath {
-            key_path: key.split('/').map(|s| s.to_string()).collect(),
-        };
-        let merkle_root = MerkleRoot {
-            hash: final_root.0.to_vec(),
-        };
-
-        proof
-            .verify_non_membership(&FULL_PROOF_SPECS, merkle_root, merkle_path)
-            .map_err(|e| tracing::error!("proof verification failed: {:?}", e))
-            .expect("nonmembership proof verifies");
-    }
-
-    Ok(())
-}
-
-#[cfg(feature = "migration-proptests")]
-mod proptests {
-    use proptest::{
-        arbitrary::any,
-        prelude::prop,
-        prop_assert, prop_assert_eq, prop_assert_ne, prop_oneof,
-        strategy::{BoxedStrategy, Just, Strategy},
-        test_runner::{FileFailurePersistence, TestCaseError},
-    };
-    use sha2::Sha256;
-    use std::{
-        collections::BTreeMap,
-        fmt::{Debug, Display, Formatter},
-        path::PathBuf,
-    };
-    use test_strategy::proptest;
-
-    use cnidarium::{StateDelta, StateRead, StateWrite as _, Storage};
-    use ibc_types::core::commitment::{MerklePath, MerkleRoot};
-
-    use crate::{FULL_PROOF_SPECS, MAIN_STORE_PROOF_SPEC};
-
-    struct ReferenceStore {
-        final_kv: BTreeMap<StorageKey, Option<Vec<u8>>>,
-    }
-
-    impl ReferenceStore {
-        fn new() -> Self {
-            Self {
-                final_kv: BTreeMap::new(),
-            }
-        }
-
-        fn execute(&mut self, op: Operation) {
-            match op {
-                Operation::Insert(key, value) => {
-                    if key.path() == "" {
-                        panic!("empty key");
-                    }
-                    self.final_kv.insert(key, Some(value));
-                }
-                Operation::Delete(key) => {
-                    self.final_kv.insert(key, None);
-                }
-            }
-        }
-    }
-
-    fn prefix_list() -> Vec<String> {
-        vec![
-            "".to_string(),
-            "dex".to_string(),
-            "ibc".to_string(),
-            "misc".to_string(),
-            "staking".to_string(),
-        ]
-    }
-
-    fn substore_list() -> Vec<String> {
-        vec![
-            "dex".to_string(),
-            "ibc".to_string(),
-            "misc".to_string(),
-            "staking".to_string(),
-        ]
-    }
-
-    fn char_except_slash() -> impl Strategy<Value = char> {
-        any::<char>().prop_filter("Exclude '/'", |c| *c != '/')
-    }
-
-    fn valid_key_strategy() -> impl Strategy<Value = String> {
-        (
-            char_except_slash(),
-            proptest::collection::vec(any::<char>(), 0..=999),
-        )
-            .prop_map(|(first_char, mut vec)| {
-                vec.insert(0, first_char);
-                vec.into_iter().collect()
-            })
-    }
-
-    fn storage_key_strategy() -> BoxedStrategy<StorageKey> {
-        let prefixes = prefix_list();
-        let substore_strategies: Vec<BoxedStrategy<_>> =
-            prefixes.into_iter().map(|s| Just(s).boxed()).collect();
-
-        let substore_strategy = prop::strategy::Union::new_weighted(
-            substore_strategies.into_iter().map(|s| (1, s)).collect(),
-        );
-
-        let key_strategy = valid_key_strategy();
-
-        (substore_strategy, key_strategy)
-            .prop_map(|(substore, key)| StorageKey::new(substore, key))
-            .boxed()
-    }
-
-    fn value_strategy() -> impl Strategy<Value = Vec<u8>> {
-        // Generate a random byte array of length 1..10
-        // The values don't actually matter for the tests.
-        prop::collection::vec(any::<u8>(), 1..10)
-    }
-
-    fn operation_strategy() -> impl Strategy<Value = Operation> {
-        let insert_strategy = (storage_key_strategy(), value_strategy())
-            .prop_map(|(key, value)| Operation::Insert(key, value));
-
-        let delete_strategy = storage_key_strategy().prop_map(Operation::Delete);
-
-        prop_oneof![insert_strategy, delete_strategy,]
-    }
-
-    fn insert_strategy() -> impl Strategy<Value = Operation> {
-        let insert_strategy = (storage_key_strategy(), value_strategy())
-            .prop_map(|(key, value)| Operation::Insert(key, value));
-
-        prop_oneof![insert_strategy]
-    }
-
-    fn insert_ops_strategy() -> impl Strategy<Value = Vec<Operation>> {
-        prop::collection::vec(insert_strategy(), 0..10000)
-    }
-
-    fn operations_strategy() -> impl Strategy<Value = Vec<Operation>> {
-        prop::collection::vec(operation_strategy(), 0..10000)
-    }
-
-    fn execute_transcript<S: StateRead>(
-        phase: &str,
-        reference_store: &mut ReferenceStore,
-        delta: &mut StateDelta<S>,
-        transcript: Vec<Operation>,
-    ) {
-        for op in transcript {
-            reference_store.execute(op.clone());
-            let storage_key = op.key();
-            let key_hash = storage_key.hash();
-            let key_path = storage_key.path();
-
-            tracing::debug!(
-                prefix = storage_key.prefix(),
-                key = storage_key.truncated_key(),
-                ?key_hash,
-                ?op,
-                ?phase,
-            );
-
-            match op {
-                Operation::Insert(_key, value) => {
-                    delta.put_raw(key_path, value);
-                }
-                Operation::Delete(_key) => {
-                    delta.delete(key_path);
-                }
-            }
-        }
-    }
-
-    async fn check_proofs(
-        state: cnidarium::Snapshot,
-        reference_store: &ReferenceStore,
-        root_hash: jmt::RootHash,
-        phase: &str,
-    ) -> Result<(), TestCaseError> {
-        for (storage_key, reference_value) in reference_store.final_kv.iter() {
-            let key_hash = storage_key.hash();
-            let key_path = storage_key.path();
-
-            tracing::debug!(
-                prefix = storage_key.prefix(),
-                key = storage_key.truncated_key(),
-                ?key_hash,
-                ?phase,
-                "checking proofs"
-            );
-            let result_proof = state
-                .get_with_proof(storage_key.encode_path())
-                .await
-                .map_err(|e| tracing::error!(?e, "get_with_proof failed"));
-
-            prop_assert!(result_proof.is_ok(), "can get with proof");
-
-            let (retrieved_value, proof) = result_proof.expect("can get with proof");
-            prop_assert_eq!(&retrieved_value, reference_value);
-
-            let merkle_path = storage_key.merkle_path();
-            let merkle_root = MerkleRoot {
-                hash: root_hash.0.to_vec(),
-            };
-            let specs = storage_key.proof_spec();
-            let key_hash = jmt::KeyHash::with::<Sha256>(&key_path);
-
-            tracing::debug!(
-                prefix = storage_key.prefix(),
-                num_proofs = proof.proofs.len(),
-                spec_len = specs.len(),
-                ?key_hash,
-                truncated_key = storage_key.truncated_key(),
-                is_existence = reference_value.is_some(),
-                "proof verification"
-            );
-
-            let proof_verifies = if let Some(value) = retrieved_value.clone() {
-                proof
-                    .verify_membership(&specs, merkle_root, merkle_path, value, 0)
-                    .map_err(|e| tracing::error!(?e, "existence proof failed"))
-            } else {
-                proof
-                    .verify_non_membership(&specs, merkle_root, merkle_path)
-                    .map_err(|e| tracing::error!(?e, "nonexistence proof failed"))
-            };
-
-            prop_assert!(proof_verifies.is_ok());
-        }
-        Ok(())
-    }
-
-    /// Implements a standard migration test which consists of three phases:
-    /// - premigration: write and delete keys, check ex/nex proofs
-    /// - migration: write and delete keys using a migration commit, check ex/nex proofs
-    /// - postmigration: write new keys, check ex/nex proofs
-    async fn standard_migration_test(
-        db_path: PathBuf,
-        premigration_transcript: Vec<Operation>,
-        migration_transcript: Vec<Operation>,
-        postmigration_transcript: Vec<Operation>,
-    ) -> Result<(), TestCaseError> {
-        let substore_prefixes = substore_list();
-
-        let premigration_len = premigration_transcript.len();
-        let migration_len = migration_transcript.len();
-        let postmigration_len = postmigration_transcript.len();
-        let total_ops = premigration_len + migration_len + postmigration_len;
-
-        tracing::info!(
-            premigration_len,
-            migration_len,
-            postmigration_len,
-            total_ops,
-            "starting test"
-        );
-
-        let storage = Storage::load(db_path.clone(), substore_prefixes.clone())
-            .await
-            .expect("Failed to load storage");
-        // `ReferenceStore` is an in-memory store that tracks the latest value for each key
-        // To do this, the store execute each operation in the transcript and tracks the final value.
-        // It serves as a source of truth to compare the storage against.
-        let mut reference_store = ReferenceStore::new();
-
-        // Premigration: write and delete keys
-        let mut premigration_delta = StateDelta::new(storage.latest_snapshot());
-
-        execute_transcript(
-            "premigration",
-            &mut reference_store,
-            &mut premigration_delta,
-            premigration_transcript,
-        );
-
-        let premigration_root_hash = storage
-            .commit(premigration_delta)
-            .await
-            .expect("can commit premigration");
-        let premigration_version = storage.latest_version();
-        prop_assert_eq!(premigration_version, 0, "premigration version should be 0");
-
-        tracing::info!(
-            ?premigration_root_hash,
-            premigration_len,
-            "premigration operations have been committed"
-        );
-
-        let premigration_snapshot = storage.latest_snapshot();
-        let _ = check_proofs(
-            premigration_snapshot,
-            &reference_store,
-            premigration_root_hash,
-            "premigration",
-        )
-        .await?;
-
-        // Migration: write and delete keys
-        let mut migration_delta = StateDelta::new(storage.latest_snapshot());
-        execute_transcript(
-            "migration",
-            &mut reference_store,
-            &mut migration_delta,
-            migration_transcript,
-        );
-
-        let migration_root_hash = storage
-            .commit_in_place(migration_delta)
-            .await
-            .expect("can commit migration");
-        let migration_version = storage.latest_version();
-        prop_assert_eq!(migration_version, 0, "migration version should be 0");
-        prop_assert_ne!(
-            migration_root_hash,
-            premigration_root_hash,
-            "migration root hash should be different than the premigration root hash"
-        );
-
-        storage.release().await;
-        let storage = Storage::load(db_path.clone(), substore_prefixes.clone())
-            .await
-            .expect("can reload storage");
-
-        tracing::info!(
-            ?migration_root_hash,
-            migration_len,
-            "migration operations have been committed"
-        );
-
-        let migration_snapshot = storage.latest_snapshot();
-
-        let _ = check_proofs(
-            migration_snapshot,
-            &reference_store,
-            migration_root_hash,
-            "migration",
-        )
-        .await?;
-
-        // We toss the storage instance and reload it.
-        storage.release().await;
-        let storage = Storage::load(db_path.clone(), substore_prefixes.clone())
-            .await
-            .expect("can reload storage");
-
-        // Post-migration: write new keys!
-        let mut postmigration_delta = StateDelta::new(storage.latest_snapshot());
-        execute_transcript(
-            "postmigration",
-            &mut reference_store,
-            &mut postmigration_delta,
-            postmigration_transcript,
-        );
-
-        let postmigration_root_hash = storage
-            .commit(postmigration_delta)
-            .await
-            .expect("can commit postmigration");
-        tracing::info!(
-            ?postmigration_root_hash,
-            num_ops = postmigration_len,
-            "postmigration operations have been committed"
-        );
-
-        let postmigration_version = storage.latest_version();
-        prop_assert_eq!(
-            postmigration_version,
-            1,
-            "postmigration version should be 1"
-        );
-        prop_assert_ne!(
-            migration_root_hash,
-            postmigration_root_hash,
-            "postmigration root hash should be different than the migration root hash"
-        );
-
-        let post_migration_snapshot = storage.latest_snapshot();
-
-        let _ = check_proofs(
-            post_migration_snapshot,
-            &reference_store,
-            postmigration_root_hash,
-            "postmigration",
-        )
-        .await?;
-        Ok(())
-    }
-
-    #[proptest(async = "tokio", cases = 100, failure_persistence = Some(Box::new(FileFailurePersistence::WithSource("regressions"))))]
-    async fn test_migration_substores(
-        #[strategy(operations_strategy())] premigration_transcript: Vec<Operation>,
-        #[strategy(operations_strategy())] migration_transcript: Vec<Operation>,
-        #[strategy(operations_strategy())] postmigration_transcript: Vec<Operation>,
-        #[strategy(insert_ops_strategy())] nonexistence_keys: Vec<Operation>,
-    ) {
-        let _ = tracing_subscriber::fmt::try_init();
-
-        let tmpdir = tempfile::tempdir().expect("Failed to create a temp dir");
-        let db_path = tmpdir.into_path();
-        let _ = standard_migration_test(
-            db_path.clone(),
-            premigration_transcript,
-            migration_transcript,
-            postmigration_transcript,
-        )
-        .await;
-
-        let storage = Storage::load(db_path.clone(), substore_list())
-            .await
-            .expect("can reload storage");
-
-        let postmigration_root_hash = storage
-            .latest_snapshot()
-            .root_hash()
-            .await
-            .expect("infaillible");
-
-        // Check random keys that should not exist
-        for op in nonexistence_keys {
-            let storage_key = op.key();
-            let key_hash = storage_key.hash();
-            let key_path = storage_key.path();
-
-            tracing::debug!(
-                prefix = storage_key.prefix(),
-                key = &storage_key.truncated_key(),
-                ?key_hash,
-                ?op,
-                "nex: checking proofs"
-            );
-
-            let result_proof = storage
-                .latest_snapshot()
-                .get_with_proof(storage_key.encode_path())
-                .await
-                .map_err(|e| tracing::error!(?e, "nex: get_with_proof failed"));
-
-            prop_assert!(result_proof.is_ok(), "can get with proof");
-
-            let (retrieved_value, proof) = result_proof.expect("can get with proof");
-            prop_assert!(retrieved_value.is_none(), "key should not exist");
-
-            let merkle_path = storage_key.merkle_path();
-            let merkle_root = MerkleRoot {
-                hash: postmigration_root_hash.0.to_vec(),
-            };
-            let specs = storage_key.proof_spec();
-            let key_hash = jmt::KeyHash::with::<Sha256>(&key_path);
-
-            tracing::debug!(
-                prefix = storage_key.prefix(),
-                num_proofs = proof.proofs.len(),
-                spec_len = specs.len(),
-                ?key_hash,
-                truncated_key = &storage_key.truncated_key(),
-                "nex: proof verification"
-            );
-
-            let proof_verifies = proof
-                .verify_non_membership(&specs, merkle_root, merkle_path)
-                .map_err(|e| tracing::error!(?e, "nonexistence: nonexistence proof failed"));
-
-            prop_assert!(proof_verifies.is_ok());
-        }
-    }
-
-    #[derive(Clone)]
-    enum Operation {
-        Insert(StorageKey, Vec<u8>),
-        Delete(StorageKey),
-    }
-
-    impl Operation {
-        fn key(&self) -> &StorageKey {
-            match self {
-                Operation::Insert(key, _) => key,
-                Operation::Delete(key) => key,
-            }
-        }
-    }
-
-    impl Debug for Operation {
-        fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-            match self {
-                Operation::Insert(_, _) => write!(f, "Insert"),
-                Operation::Delete(_) => write!(f, "Delete"),
-            }
-        }
-    }
-
-    #[derive(PartialEq, Eq, Clone, PartialOrd, Ord)]
-    struct StorageKey {
-        prefix: String,
-        key: String,
-        full_path: String,
-    }
-
-    impl Display for StorageKey {
-        fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{}", self.path())
-        }
-    }
-
-    impl Debug for StorageKey {
-        fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{}", self.full_path)
-        }
-    }
-
-    impl StorageKey {
-        fn new(prefix: String, key: String) -> Self {
-            let full_path = if prefix.is_empty() {
-                key.clone()
-            } else {
-                format!("{}/{}", prefix, key)
-            };
-
-            Self {
-                prefix,
-                key,
-                full_path,
-            }
-        }
-
-        fn truncated_key(&self) -> String {
-            self.key.chars().take(5).collect()
-        }
-
-        fn hash(&self) -> jmt::KeyHash {
-            jmt::KeyHash::with::<Sha256>(&self.full_path)
-        }
-
-        fn encode_path(&self) -> Vec<u8> {
-            self.path().as_bytes().to_vec()
-        }
-
-        fn prefix(&self) -> &String {
-            &self.prefix
-        }
-
-        fn is_main_store(&self) -> bool {
-            self.prefix == ""
-        }
-
-        fn path(&self) -> String {
-            self.full_path.clone()
-        }
-
-        fn merkle_path(&self) -> MerklePath {
-            if self.is_main_store() {
-                return MerklePath {
-                    key_path: vec![self.key.clone()],
-                };
-            } else {
-                MerklePath {
-                    key_path: vec![self.prefix.clone(), self.key.clone()],
-                }
-            }
-        }
-
-        fn proof_spec(&self) -> Vec<ics23::ProofSpec> {
-            if self.is_main_store() {
-                MAIN_STORE_PROOF_SPEC.clone()
-            } else {
-                FULL_PROOF_SPECS.clone()
-            }
-        }
-    }
-}
diff --git a/crates/cnidarium/tests/substore_tests.rs b/crates/cnidarium/tests/substore_tests.rs
deleted file mode 100644
index f3ee5e4f83..0000000000
--- a/crates/cnidarium/tests/substore_tests.rs
+++ /dev/null
@@ -1,751 +0,0 @@
-use cnidarium::StateDelta;
-use cnidarium::StateRead;
-use cnidarium::StateWrite;
-use cnidarium::Storage;
-use ibc_types::core::commitment::MerklePath;
-use ibc_types::core::commitment::MerkleRoot;
-use jmt::RootHash;
-use once_cell::sync::Lazy;
-use tempfile;
-use tokio;
-use tokio_stream::StreamExt;
-
-#[tokio::test]
-#[should_panic]
-/// Test that we cannot create a storage with an empty substore prefix.
-async fn test_disallow_empty_prefix() -> () {
-    let tmpdir = tempfile::tempdir().expect("creating a temporary directory works");
-    let db_path = tmpdir.into_path();
-    let substore_prefixes = vec![""].into_iter().map(|s| s.to_string()).collect();
-    let _ = Storage::load(db_path, substore_prefixes).await.unwrap();
-}
-
-#[tokio::test]
-/// Test that we route keys correctly, in particular that we do not allow collisions for keys
-/// that lack a delimiter e.g. `prefix_a/key` and `prefix_akey`.
-async fn test_route_key_cases() -> () {
-    let tmpdir = tempfile::tempdir().expect("creating a temporary directory works");
-    let db_path = tmpdir.into_path();
-    let substore_prefixes = vec!["prefix_a", "prefix_b"]
-        .into_iter()
-        .map(|s| s.to_string())
-        .collect();
-    let storage = Storage::load(db_path, substore_prefixes).await.unwrap();
-    let mut delta = StateDelta::new(storage.latest_snapshot());
-
-    let keys = vec![
-        "prefix_a/key_1",
-        "prefix_akey_1",
-        "prefix_a/",
-        // TODO(erwan): Making sure that there are no collisions between
-        // `prefix_a/` and `prefix_a` is important. However, in practice
-        // `prefix_a` stores the root hash of the substore, so 1/ it will
-        // not containt the value we put in it since it got overwritten
-        // during the commit step, 2/ it will be disallowed shortly
-        // in a follow-up PR. When we do that, we can remove the commented
-        // out test case below. And instead replace it with a vector that
-        // checks that we are NOT able to write to `prefix_a` directly.
-        // "prefix_a", <- this should be disallowed.
-        "prefix_b/key_1",
-    ];
-    let values = vec![
-        "value_1a".as_bytes().to_vec(),
-        "value_1b".as_bytes().to_vec(),
-        "value_1c".as_bytes().to_vec(),
-        "value_1d".as_bytes().to_vec(),
-        "value_1e".as_bytes().to_vec(),
-    ];
-
-    for (key, value) in keys.iter().zip(values.iter()) {
-        delta.put_raw(key.to_string(), value.to_vec());
-    }
-    let _ = storage.commit(delta).await.unwrap();
-    let snapshot = storage.latest_snapshot();
-
-    for (key, value) in keys.iter().zip(values.iter()) {
-        let retrieved_value = snapshot.get_raw(key).await.unwrap().unwrap();
-        assert_eq!(retrieved_value, *value, "key (key={}) should match", key);
-    }
-}
-
-#[tokio::test]
-async fn test_substore_proofs() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-    let db_path = tmpdir.into_path();
-    let substore_prefixes = vec!["ibc", "prefix_b", "prefix_c"]
-        .into_iter()
-        .map(|s| s.to_string())
-        .collect();
-    let storage = Storage::load(db_path, substore_prefixes).await?;
-    let mut delta = StateDelta::new(storage.latest_snapshot());
-
-    let key_a_1 = "ibc/key_1".to_string();
-    let value_a_1 = "value_1a".as_bytes().to_vec();
-    delta.put_raw(key_a_1.clone(), value_a_1.clone());
-
-    storage.commit(delta).await?;
-
-    let snapshot = storage.latest_snapshot();
-
-    pub static PENUMBRA_PROOF_SPECS: Lazy<Vec<ics23::ProofSpec>> =
-        Lazy::new(|| vec![cnidarium::ics23_spec(), cnidarium::ics23_spec()]);
-
-    // check that we can verify proofs back to the root for the new value.
-    let root = snapshot.root_hash().await?;
-    let (retreived_value, proof) = snapshot.get_with_proof(key_a_1.into()).await?;
-    assert_eq!(
-        Some(value_a_1),
-        retreived_value.clone(),
-        "key should exist and match value"
-    );
-    let merkle_path = MerklePath {
-        key_path: vec!["ibc".to_string(), "key_1".to_string()],
-    };
-    let merkle_root = MerkleRoot {
-        hash: root.0.to_vec(),
-    };
-    proof.verify_membership(
-        &PENUMBRA_PROOF_SPECS,
-        merkle_root.clone(),
-        merkle_path,
-        retreived_value.unwrap(),
-        0,
-    )?;
-
-    // check that non-existence proofs work
-    let (retreived_value, nex_proof) = snapshot.get_with_proof("ibc/doesntexist".into()).await?;
-    assert_eq!(retreived_value, None, "key should not exist");
-
-    tracing::debug!(?retreived_value, ?nex_proof, "got non-existence proof");
-
-    let merkle_path = MerklePath {
-        key_path: vec!["ibc".to_string(), "doesntexist".to_string()],
-    };
-    nex_proof
-        .verify_non_membership(&PENUMBRA_PROOF_SPECS, merkle_root, merkle_path)
-        .expect("non-existence proof should verify");
-
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that we can create a storage with multiple substores, that we can write to them, and that
-/// we can read from them.
-async fn test_substore_simple() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-    let db_path = tmpdir.into_path();
-    let substore_prefixes = vec!["prefix_a", "prefix_b", "prefix_c"]
-        .into_iter()
-        .map(|s| s.to_string())
-        .collect();
-    let storage = Storage::load(db_path, substore_prefixes).await?;
-    let mut delta = StateDelta::new(storage.latest_snapshot());
-
-    let key_a_1 = "prefix_a/key_1".to_string();
-    let value_a_1 = "value_1a".as_bytes().to_vec();
-    tracing::debug!(?key_a_1, ?value_a_1, "calling `put_raw`");
-    delta.put_raw(key_a_1.clone(), value_a_1.clone());
-
-    let key_root_1 = "key_1".to_string();
-    let value_root_1 = "value_1".as_bytes().to_vec();
-    tracing::debug!(?key_root_1, ?value_root_1, "calling `put_raw`");
-    delta.put_raw(key_root_1.clone(), value_root_1.clone());
-
-    tracing::debug!("committing first batch of writes");
-    let global_root_hash_1 = storage.commit(delta).await?;
-
-    tracing::debug!("checking that we can read the values back out");
-    // Check that we can read the values back out.
-    let snapshot = storage.latest_snapshot();
-
-    let retrieved_value_a1 = snapshot.get_raw(key_a_1.as_str()).await?.unwrap();
-    assert_eq!(retrieved_value_a1, value_a_1);
-
-    let retrieved_value_root_1 = snapshot.get_raw(key_root_1.as_str()).await?.unwrap();
-    assert_eq!(retrieved_value_root_1, value_root_1);
-
-    // Check that the prefix root hash is stored at the correct key.
-    // One method looks up the key in the main store, the other creates a jmt over
-    // the substore and looks up the root hash in that tree.
-    let retrieved_prefix_a_root_hash = snapshot
-        .get_raw("prefix_a")
-        .await?
-        .expect("key `prefix_a` should contain the substore root hash");
-    assert_eq!(
-        retrieved_prefix_a_root_hash.len(),
-        global_root_hash_1.0.len()
-    );
-
-    let retrieved_prefix_a_root_hash = RootHash(retrieved_prefix_a_root_hash.try_into().unwrap());
-    let prefix_a_root_hash = snapshot.prefix_root_hash("prefix_a").await?;
-    assert_eq!(prefix_a_root_hash, retrieved_prefix_a_root_hash);
-    let old_prefix_a_root_hash = prefix_a_root_hash;
-
-    drop(snapshot);
-
-    // Check that we can read new values from a prefixed substore, then check that
-    // versioning works correctly, by making sure that we fetch the correct root hash.
-    let key_a_2 = "prefix_a/key_2".to_string();
-    let value_a_2 = "value_2a".as_bytes().to_vec();
-    let mut delta = StateDelta::new(storage.latest_snapshot());
-    delta.put_raw(key_a_2.clone(), value_a_2.clone());
-    let global_root_hash_2 = storage.commit(delta).await?;
-
-    // CHeck that we can read the new value back out.
-    let snapshot = storage.latest_snapshot();
-    let retrieved_value_a2 = snapshot.get_raw(key_a_2.as_str()).await?.unwrap();
-    assert_eq!(retrieved_value_a2, value_a_2);
-    let retrieved_value_a1 = snapshot.get_raw(key_a_1.as_str()).await?.unwrap();
-    assert_eq!(retrieved_value_a1, value_a_1);
-
-    // Retrieve the substore root hash again, and check that it has changed.
-    assert_ne!(global_root_hash_1, global_root_hash_2); // sanity check.
-    let prefix_a_root_hash = snapshot.prefix_root_hash("prefix_a").await?;
-    let retrieved_prefix_a_root_hash = snapshot
-        .get_raw("prefix_a")
-        .await?
-        .expect("prefix_a should contain the substore root hash");
-    assert_eq!(
-        prefix_a_root_hash,
-        RootHash(retrieved_prefix_a_root_hash.try_into().unwrap())
-    );
-    assert_ne!(prefix_a_root_hash, old_prefix_a_root_hash);
-
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that we can create a storage with multiple substores, that we can write to them, and that
-/// we can read from them using prefix queries.
-async fn test_substore_prefix_queries() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-    let db_path = tmpdir.into_path();
-    let substore_prefixes = vec!["prefix_a", "prefix_b", "prefix_c"]
-        .into_iter()
-        .map(|s| s.to_string())
-        .collect();
-    let storage = Storage::load(db_path, substore_prefixes).await?;
-    let mut delta = StateDelta::new(storage.latest_snapshot());
-
-    let mut all_kv = vec![];
-    let mut kv_a = vec![];
-    let mut kv_b = vec![];
-    let mut kv_main = vec![];
-    for i in 0..10 {
-        let key_a_i = format!("prefix_a/key_{}", i);
-        let value_a_i = format!("value_{}a", i).as_bytes().to_vec();
-        delta.put_raw(key_a_i.clone(), value_a_i.clone());
-        all_kv.push((key_a_i.clone(), value_a_i.clone()));
-        kv_a.push((key_a_i, value_a_i));
-    }
-
-    for i in 0..10 {
-        let key_b_i = format!("prefix_b/key_{}", i);
-        let value_b_i = format!("value_{}b", i).as_bytes().to_vec();
-        delta.put_raw(key_b_i.clone(), value_b_i.clone());
-        all_kv.push((key_b_i.clone(), value_b_i.clone()));
-        kv_b.push((key_b_i, value_b_i));
-    }
-
-    for i in 0..10 {
-        let key_i = format!("key_{}", i);
-        let value_i = format!("value_{}", i).as_bytes().to_vec();
-        delta.put_raw(key_i.clone(), value_i.clone());
-        all_kv.push((key_i.clone(), value_i.clone()));
-        kv_main.push((key_i, value_i));
-    }
-
-    let _ = storage.commit(delta).await?;
-
-    let snapshot = storage.latest_snapshot();
-    let mut counter = 0;
-    let query_prefix = "prefix_a";
-    let mut range = snapshot.prefix_keys(query_prefix);
-    while let Some(res) = range.next().await {
-        let key = res?;
-        if counter >= kv_a.len() {
-            tracing::debug!(?key, ?query_prefix, "unexpected key");
-            panic!("prefix_keys query returned too many entries")
-        }
-
-        let expected_key = kv_a[counter].0.clone();
-        assert_eq!(key, expected_key, "key {} should match", counter);
-        counter += 1;
-    }
-    assert_eq!(
-        counter,
-        kv_a.len(),
-        "should have iterated over all keys (prefix_a)"
-    );
-
-    let mut counter = 0;
-    let query_prefix = "prefix_b";
-    let mut range = snapshot.prefix_keys(query_prefix);
-    while let Some(res) = range.next().await {
-        let key = res?;
-
-        if counter >= kv_b.len() {
-            tracing::debug!(?key, ?query_prefix, "unexpected key");
-            panic!("prefix_keys query returned too many entries")
-        }
-
-        let expected_key = kv_b[counter].0.clone();
-        assert_eq!(key, expected_key, "key {} should match", counter);
-        counter += 1;
-    }
-    assert_eq!(
-        counter,
-        kv_b.len(),
-        "should have iterated over all keys (prefix_b)"
-    );
-
-    let mut counter = 0;
-    let query_prefix = "key";
-    let mut range = snapshot.prefix_keys(query_prefix);
-    while let Some(res) = range.next().await {
-        let key = res?;
-        tracing::debug!(?key, ?query_prefix, "iterating over keys");
-
-        if counter >= kv_main.len() {
-            tracing::debug!(?key, ?query_prefix, "unexpected key");
-            panic!("prefix_keys query returned too many entries")
-        }
-
-        let expected_key = kv_main[counter].0.clone();
-        assert_eq!(key, expected_key, "key {} should match", counter);
-        counter += 1;
-    }
-    assert_eq!(
-        counter,
-        kv_main.len(),
-        "should have iterated over all keys (main)"
-    );
-
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that `StateRead::prefix_keys` work as expected.
-/// This test is similar to `test_substore_prefix_queries`, but uses `prefix_keys` instead of
-/// `prefix_raw`.
-async fn test_substore_prefix_keys() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-    let db_path = tmpdir.into_path();
-    let substore_prefixes = vec!["prefix_a", "prefix_b", "prefix_c"]
-        .into_iter()
-        .map(|s| s.to_string())
-        .collect();
-    let storage = Storage::load(db_path, substore_prefixes).await?;
-    let mut delta = StateDelta::new(storage.latest_snapshot());
-
-    let mut all_kv = vec![];
-    let mut kv_a = vec![];
-    let mut kv_b = vec![];
-    let mut kv_main = vec![];
-    for i in 0..10 {
-        let key_a_i = format!("prefix_a/key_{}", i);
-        let value_a_i = format!("value_{}a", i).as_bytes().to_vec();
-        delta.put_raw(key_a_i.clone(), value_a_i.clone());
-        all_kv.push((key_a_i.clone(), value_a_i.clone()));
-        kv_a.push((key_a_i, value_a_i));
-    }
-
-    for i in 0..10 {
-        let key_b_i = format!("prefix_b/key_{}", i);
-        let value_b_i = format!("value_{}b", i).as_bytes().to_vec();
-        delta.put_raw(key_b_i.clone(), value_b_i.clone());
-        all_kv.push((key_b_i.clone(), value_b_i.clone()));
-        kv_b.push((key_b_i, value_b_i));
-    }
-
-    for i in 0..10 {
-        let key_i = format!("key_{}", i);
-        let value_i = format!("value_{}", i).as_bytes().to_vec();
-        delta.put_raw(key_i.clone(), value_i.clone());
-        all_kv.push((key_i.clone(), value_i.clone()));
-        kv_main.push((key_i, value_i));
-    }
-
-    let _ = storage.commit(delta).await?;
-
-    let snapshot = storage.latest_snapshot();
-    let mut counter = 0;
-    let query_prefix = "prefix_a";
-    let mut range = snapshot.prefix_keys(query_prefix);
-    while let Some(res) = range.next().await {
-        let key = res?;
-        if counter >= kv_a.len() {
-            tracing::debug!(?key, ?query_prefix, "unexpected key");
-            panic!("prefix_keys query returned too many entries")
-        }
-
-        let expected_key = kv_a[counter].0.clone();
-        assert_eq!(key, expected_key, "key {} should match", counter);
-        counter += 1;
-    }
-    assert_eq!(
-        counter,
-        kv_a.len(),
-        "should have iterated over all keys (prefix_a)"
-    );
-
-    let mut counter = 0;
-    let query_prefix = "prefix_b";
-    let mut range = snapshot.prefix_keys(query_prefix);
-    while let Some(res) = range.next().await {
-        let key = res?;
-
-        if counter >= kv_b.len() {
-            tracing::debug!(?key, ?query_prefix, "unexpected key");
-            panic!("prefix_keys query returned too many entries")
-        }
-
-        let expected_key = kv_b[counter].0.clone();
-        assert_eq!(key, expected_key, "key {} should match", counter);
-        counter += 1;
-    }
-    assert_eq!(
-        counter,
-        kv_b.len(),
-        "should have iterated over all keys (prefix_b)"
-    );
-
-    let mut counter = 0;
-    let query_prefix = "key";
-    let mut range = snapshot.prefix_raw(query_prefix);
-    while let Some(res) = range.next().await {
-        let (key, value) = res?;
-        tracing::debug!(?key, ?query_prefix, "iterating over key/value pair");
-
-        if counter >= kv_main.len() {
-            tracing::debug!(?key, ?value, ?query_prefix, "unexpected key/value pair");
-            panic!("prefix query returned too many entries")
-        }
-
-        let expected_key = kv_main[counter].0.clone();
-        let expected_value = kv_main[counter].1.clone();
-        assert_eq!(key, expected_key, "key {} should match", counter);
-        assert_eq!(value, expected_value, "value {} should match", counter);
-        counter += 1;
-    }
-    assert_eq!(
-        counter,
-        kv_main.len(),
-        "should have iterated over all keys (main)"
-    );
-
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that `StateRead::nonverifiable_prefix_raw` works as expected.
-/// This test is similar to `test_substore_prefix_queries`, but uses nonverifiable storage.
-async fn test_substore_nv_prefix() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-    let db_path = tmpdir.into_path();
-    let substore_prefixes = vec!["prefix_a", "prefix_b", "prefix_c"]
-        .into_iter()
-        .map(|s| s.to_string())
-        .collect();
-    let storage = Storage::load(db_path, substore_prefixes).await?;
-    let mut delta = StateDelta::new(storage.latest_snapshot());
-
-    let mut all_kv = vec![];
-    let mut kv_a = vec![];
-    let mut kv_b = vec![];
-    let mut kv_main = vec![];
-    for i in 0..10 {
-        let key_a_i = format!("prefix_a/key_{}", i);
-        let value_a_i = format!("value_{}a", i);
-        delta.nonverifiable_put_raw(key_a_i.as_bytes().to_vec(), value_a_i.as_bytes().to_vec());
-        all_kv.push((key_a_i.clone(), value_a_i.clone()));
-        kv_a.push((key_a_i, value_a_i));
-    }
-
-    for i in 0..10 {
-        let key_b_i = format!("prefix_b/key_{}", i);
-        let value_b_i = format!("value_{}b", i);
-        delta.nonverifiable_put_raw(key_b_i.as_bytes().to_vec(), value_b_i.as_bytes().to_vec());
-        all_kv.push((key_b_i.clone(), value_b_i.clone()));
-        kv_b.push((key_b_i, value_b_i));
-    }
-
-    for i in 0..10 {
-        let key_i = format!("key_{}", i);
-        let value_i = format!("value_{}", i);
-        delta.nonverifiable_put_raw(key_i.as_bytes().to_vec(), value_i.as_bytes().to_vec());
-        all_kv.push((key_i.clone(), value_i.clone()));
-        kv_main.push((key_i, value_i));
-    }
-
-    let _ = storage.commit(delta).await?;
-
-    let snapshot = storage.latest_snapshot();
-    let mut counter = 0;
-    let query_prefix = "prefix_a".as_bytes();
-    let mut range = snapshot.nonverifiable_prefix_raw(query_prefix);
-    while let Some(res) = range.next().await {
-        let (raw_key, raw_value) = res?;
-        let key = String::from_utf8(raw_key)?;
-        let value = String::from_utf8(raw_value)?;
-        if counter >= kv_a.len() {
-            tracing::debug!(?key, ?query_prefix, "unexpected key");
-            panic!("prefix_keys query returned too many entries")
-        }
-
-        let expected_key = kv_a[counter].0.clone();
-        let expected_value = kv_a[counter].1.clone();
-        assert_eq!(key, expected_key, "key {} should match", counter);
-        assert_eq!(value, expected_value, "value {} should match", counter);
-
-        counter += 1;
-    }
-    assert_eq!(
-        counter,
-        kv_a.len(),
-        "should have iterated over all prefix (prefix_a)"
-    );
-
-    let mut counter = 0;
-    let query_prefix = "prefix_b".as_bytes();
-    let mut range = snapshot.nonverifiable_prefix_raw(query_prefix);
-    while let Some(res) = range.next().await {
-        let (raw_key, raw_value) = res?;
-        let key = String::from_utf8(raw_key)?;
-        let value = String::from_utf8(raw_value)?;
-
-        if counter >= kv_b.len() {
-            tracing::debug!(?key, ?query_prefix, "unexpected key");
-            panic!("prefix_keys query returned too many entries")
-        }
-
-        let expected_key = kv_b[counter].0.clone();
-        let expected_value = kv_b[counter].1.clone();
-        assert_eq!(key, expected_key, "key {} should match", counter);
-        assert_eq!(value, expected_value, "value {} should match", counter);
-        counter += 1;
-    }
-    assert_eq!(
-        counter,
-        kv_b.len(),
-        "should have iterated over all prefix (prefix_b)"
-    );
-
-    let mut counter = 0;
-    let query_prefix = "key".as_bytes();
-    let mut range = snapshot.nonverifiable_prefix_raw(query_prefix);
-    while let Some(res) = range.next().await {
-        let (raw_key, raw_value) = res?;
-        let key = String::from_utf8(raw_key)?;
-        let value = String::from_utf8(raw_value)?;
-
-        tracing::debug!(?key, ?query_prefix, "iterating over prefix");
-
-        if counter >= kv_main.len() {
-            tracing::debug!(?key, ?query_prefix, "unexpected key");
-            panic!("prefix_keys query returned too many entries")
-        }
-
-        let expected_key = kv_main[counter].0.clone();
-        let expected_value = kv_main[counter].1.clone();
-        assert_eq!(key, expected_key, "key {} should match", counter);
-        assert_eq!(value, expected_value, "value {} should match", counter);
-        counter += 1;
-    }
-    assert_eq!(
-        counter,
-        kv_main.len(),
-        "should have iterated over all keys (main)"
-    );
-
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that range queries over the main store work as expected.
-/// TODO(erwan): the range query implementation is broken for substores. Ignore this test for now.
-#[ignore]
-async fn test_substore_nv_range_queries_main_store() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-    let db_path = tmpdir.into_path();
-    let substore_prefixes = vec!["a", "b", "c", "d"]
-        .into_iter()
-        .map(|s| s.to_string())
-        .collect();
-    let storage = Storage::load(db_path, substore_prefixes).await?;
-    let mut delta = StateDelta::new(storage.latest_snapshot());
-
-    let mut all_kv = vec![];
-    let mut kv_a = vec![];
-    let mut kv_c = vec![];
-    let mut kv_d = vec![];
-    let mut kv_main = vec![];
-    for i in 0..100 {
-        let key_a_i = format!("a/key_{}", i);
-        let value_a_i = format!("value_{}a", i).as_bytes().to_vec();
-        delta.put_raw(key_a_i.clone(), value_a_i.clone());
-        all_kv.push((key_a_i.clone(), value_a_i.clone()));
-        kv_a.push((key_a_i, value_a_i));
-    }
-
-    for i in 0..100 {
-        let key_c_i = format!("c/key_{}", i);
-        let value_c_i = format!("value_{}c", i).as_bytes().to_vec();
-        delta.put_raw(key_c_i.clone(), value_c_i.clone());
-        all_kv.push((key_c_i.clone(), value_c_i.clone()));
-        kv_c.push((key_c_i, value_c_i));
-    }
-
-    for i in 0..100 {
-        let key_i = format!("compactblock/{i:020}");
-        let value_i = format!("value_{}", i).as_bytes().to_vec();
-        delta.put_raw(key_i.clone(), value_i.clone());
-        all_kv.push((key_i.clone(), value_i.clone()));
-        kv_main.push((key_i, value_i));
-    }
-
-    for i in 0..100 {
-        let key_d_i = format!("d/key_{}", i);
-        let value_d_i = format!("value_{}c", i).as_bytes().to_vec();
-        delta.put_raw(key_d_i.clone(), value_d_i.clone());
-        all_kv.push((key_d_i.clone(), value_d_i.clone()));
-        kv_d.push((key_d_i, value_d_i));
-    }
-
-    let _ = storage.commit(delta).await?;
-
-    let snapshot = storage.latest_snapshot();
-
-    // First, check that we can iterate over a range of compact blocks in the main store.
-    // We define a range that spans all compact blocks between 12 and 34.
-    let mut counter = 0;
-    let start_index = 12;
-    let end_index = 34;
-    let mut index = start_index;
-
-    let start_key = format!("compactblock/{:020}", start_index)
-        .as_bytes()
-        .to_vec();
-    let end_key = format!("compactblock/{:020}", end_index)
-        .as_bytes()
-        .to_vec();
-    let mut range = snapshot.nonverifiable_range_raw(None, start_key.clone()..end_key.clone())?;
-    while let Some(res) = range.next().await {
-        let (raw_key, _) = res?;
-        let key = String::from_utf8(raw_key)?;
-        if counter > kv_a.len() {
-            tracing::debug!(?key, ?start_key, ?end_key, "unexpected key");
-            panic!("prefix_keys query returned too many entries")
-        }
-
-        let expected_key = kv_main[index].0.clone();
-        assert_eq!(key, expected_key, "key {} should match", counter);
-        counter += 1;
-        index += 1;
-    }
-    assert_eq!(
-        counter,
-        end_index - start_index,
-        "should have iterated over all entries (compact block range)"
-    );
-
-    Ok(())
-}
-
-#[tokio::test]
-/// Minimal reproduction of the prefix range cache bug.
-///
-/// Context:
-/// `cnidarium`, our storage layer, supports prefix storage.
-/// This allows users to configure independent storage units, each with
-/// their own merkle tree, nonverifiable sidecar, and separate namespace.
-/// Routing is done transparently without the user having to worry about
-/// the details.
-///
-/// Overview:
-/// Prefix queries return tuples of (key, value)s, but instead of
-/// returning the full key, they return the substore key. This is a layering
-/// violation, and indeed causes a bug in the cache interleaving logic.
-///
-/// Terminology:
-/// - a `full_key`:  a key that contains a substore prefix, a delimiter, and a substore key.
-/// - a `substore_key`: a key with a stripped prefix.
-///
-/// Walkthrough:
-/// `StateDelta` index changes using full keys, as it is not aware of the
-/// particular substore configuration that it is working against, by design.
-/// As part of the cache interleaving logic, the `StateDetla` will try look for
-/// new writes or covering deletions. However, since the base prefix implementation
-/// returns substore keys, the cache will build an incoherence range and panic (or miss data).
-async fn reproduction_bad_substore_cache_range() -> anyhow::Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-    let db_path = tmpdir.into_path();
-    // We pick a friendly prefix with high lexicographic order to help
-    // with reproducing a "bad range" where the lower boundn is greater than
-    // the upper bound.
-    let substore_prefix = "zest".to_string();
-    let substore_prefixes = vec![substore_prefix.clone()];
-    let storage = Storage::load(db_path, substore_prefixes).await?;
-
-    // Write some keys in the substore so that we can prefix range over something
-    let mut delta = StateDelta::new(storage.latest_snapshot());
-
-    let mut substore_kvs = vec![];
-
-    for i in 0..100 {
-        let k = format!("{}/key_{i:020}", substore_prefix);
-        let v = format!("value_{i}").as_bytes().to_vec();
-        delta.put_raw(k.clone(), v.clone());
-        substore_kvs.push(k)
-    }
-
-    let _ = storage.commit(delta).await?;
-    let snapshot = storage.latest_snapshot();
-
-    // We can prefix range fine on a static snapshot.
-    let mut naive_prefix = snapshot.prefix_raw("zest/");
-    // Track the number of prefix entries returned as a basic check.
-    let mut visited = vec![];
-    while let Some(entry) = naive_prefix.next().await {
-        let (k, _) = entry?;
-        visited.push(k);
-    }
-    assert_eq!(visited, substore_kvs, "prefix query is missing keys");
-
-    // We established that we can do prefix range on a static snapshot.
-    // Now let's try on a no-op `StateDelta`
-    let mut delta = StateDelta::new(snapshot);
-    let mut clean_delta_prefix = delta.prefix_raw("zest/");
-    let mut visited = vec![];
-    while let Some(entry) = clean_delta_prefix.next().await {
-        let (k, _) = entry?;
-        visited.push(k);
-    }
-    assert_eq!(visited, substore_kvs, "prefix query is missing keys");
-
-    // It worked, finally let's try on a dirty delta.
-    delta.put_raw(
-        "zest/normal_key".to_string(),
-        "normal_value".as_bytes().to_vec(),
-    );
-    let mut dirty_delta_prefix = delta.prefix_raw("zest/");
-    let mut visited = vec![];
-    // Cache interleaving logic will build a bad range and cause a panic.
-    // Check out `v0.77.3` or prior to see the panic.
-    while let Some(entry) = dirty_delta_prefix.next().await {
-        let (k, _) = entry?;
-        visited.push(k);
-    }
-    // Add the key we wrote to the substore.
-    substore_kvs.push("zest/normal_key".to_string());
-    assert_eq!(visited, substore_kvs, "prefix query is missing keys");
-
-    Ok(())
-}
diff --git a/crates/cnidarium/tests/write_batch.rs b/crates/cnidarium/tests/write_batch.rs
deleted file mode 100644
index 0717400fd0..0000000000
--- a/crates/cnidarium/tests/write_batch.rs
+++ /dev/null
@@ -1,302 +0,0 @@
-use anyhow::Result;
-use cnidarium::{StateDelta, StateWrite, Storage};
-use tempfile;
-use tokio;
-
-#[tokio::test]
-/// A simple test that checks that we cannot commit a stale batch to storage.
-/// Strategy:
-/// Create three state deltas, one that writes to every substore, and two others
-/// that target specific substores or none at all.
-pub async fn test_write_batch_stale_version_substores() -> Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-    let db_path = tmpdir.into_path();
-    let substore_prefixes = vec![
-        "ibc".to_string(),
-        "dex".to_string(),
-        "misc".to_string(),
-        "cometbft-data".to_string(),
-    ];
-    let storage = Storage::load(db_path.clone(), substore_prefixes.clone()).await?;
-    let initial_snapshot = storage.latest_snapshot();
-    let initial_version = initial_snapshot.version();
-    let initial_root_hash = initial_snapshot.root_hash().await?;
-    assert_eq!(
-        initial_version,
-        u64::MAX,
-        "initial version should be u64::MAX"
-    );
-    assert_eq!(initial_root_hash.0, [0u8; 32]);
-
-    /* ************************ Prepare three deltas ************************** */
-    // Our goal is to check that we can't commit a batch with a stale version.
-    // We create three deltas:
-    // 1. Empty delta
-    // 2. Delta that writes to one substore
-    // 3. Delta that writes to each substore and also writes to the main store
-
-    /* We create an empty delta that writes no keys. */
-    let delta_1 = StateDelta::new(initial_snapshot);
-    let write_batch_1 = storage.prepare_commit(delta_1).await?;
-    let version_1 = write_batch_1.version();
-    let root_hash_1 = write_batch_1.root_hash().clone();
-    assert_eq!(version_1, initial_version.wrapping_add(1));
-    assert_ne!(root_hash_1.0, initial_root_hash.0);
-
-    // We check that merely preparing a batch does not write anything.
-    let state_snapshot = storage.latest_snapshot();
-    assert_eq!(state_snapshot.version(), initial_version);
-    assert_eq!(state_snapshot.root_hash().await?.0, initial_root_hash.0);
-    for prefix in substore_prefixes.iter() {
-        // We didn't write to any substores, so their version should be unchanged.
-        assert_eq!(
-            write_batch_1
-                .substore_version(prefix)
-                .expect("substore exists"),
-            u64::MAX
-        )
-    }
-
-    /* We create a new delta that writes to a single substore. */
-    let mut delta_2 = StateDelta::new(state_snapshot.clone());
-    delta_2.put_raw("ibc/key".to_string(), [1u8; 32].to_vec());
-    let write_batch_2 = storage.prepare_commit(delta_2).await?;
-    let version_2 = write_batch_2.version();
-    let root_hash_2 = write_batch_2.root_hash();
-    assert_eq!(version_2, initial_version.wrapping_add(1));
-    assert_ne!(root_hash_2.0, initial_root_hash.0);
-
-    // Now, we check that the version for the main store is incremented, and
-    // only the version for the ibc substore is incremented.
-    assert_eq!(write_batch_2.version(), initial_version.wrapping_add(1));
-    assert_eq!(
-        write_batch_2
-            .substore_version("ibc")
-            .expect("substore_exists"),
-        initial_version.wrapping_add(1)
-    );
-    for prefix in substore_prefixes.iter().filter(|p| *p != "ibc") {
-        assert_eq!(
-            write_batch_2
-                .substore_version(prefix)
-                .expect("substore exists"),
-            u64::MAX
-        )
-    }
-
-    /* We create a new delta that writes to each substore. */
-    let mut delta_3 = StateDelta::new(state_snapshot);
-    for substore_prefix in substore_prefixes.iter() {
-        let key = format!("{}/key", substore_prefix);
-        tracing::debug!(?key, "adding to delta_1");
-        delta_3.put_raw(key, [1u8; 32].to_vec());
-    }
-    let write_batch_3 = storage.prepare_commit(delta_3).await?;
-    let version_3 = write_batch_3.version();
-    let root_hash_3 = write_batch_3.root_hash().clone();
-
-    // Once again, we check that we incremented the main store version.
-    assert_eq!(version_3, initial_version.wrapping_add(1));
-    assert_ne!(root_hash_3.0, initial_root_hash.0);
-    // In addition to that, we check that we incremented the version of each substore.
-    for prefix in substore_prefixes.iter() {
-        assert_eq!(
-            write_batch_3
-                .substore_version(prefix)
-                .expect("substore exists"),
-            initial_version.wrapping_add(1)
-        )
-    }
-
-    /* Persist `write_batch_1` and check that the two other (stale) deltas cannot be applied. */
-    let final_root = storage
-        .commit_batch(write_batch_1)
-        .expect("committing batch 3 should work");
-    let final_snapshot = storage.latest_snapshot();
-    assert_eq!(root_hash_1.0, final_root.0);
-    assert_eq!(root_hash_1.0, final_snapshot.root_hash().await?.0);
-    assert_eq!(version_1, final_snapshot.version());
-    assert!(
-        storage.commit_batch(write_batch_2).is_err(),
-        "committing batch 2 should fail"
-    );
-    assert!(
-        storage.commit_batch(write_batch_3).is_err(),
-        "committing batch 3 should fail"
-    );
-
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that we can commit a batch without incrementing the substore versions if there are no
-/// keys to write.
-pub async fn test_two_empty_writes() -> Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-    let db_path = tmpdir.into_path();
-    let substore_prefixes = vec![
-        "ibc".to_string(),
-        "dex".to_string(),
-        "misc".to_string(),
-        "cometbft-data".to_string(),
-    ];
-    let storage = Storage::load(db_path.clone(), substore_prefixes.clone()).await?;
-    let initial_snapshot = storage.latest_snapshot();
-    let initial_version = initial_snapshot.version();
-    let initial_root_hash = initial_snapshot.root_hash().await?;
-    assert_eq!(
-        initial_version,
-        u64::MAX,
-        "initial version should be u64::MAX"
-    );
-    assert_eq!(initial_root_hash.0, [0u8; 32]);
-
-    let mut delta_1 = StateDelta::new(initial_snapshot);
-    for substore_prefix in substore_prefixes.iter() {
-        let key = format!("{}/key", substore_prefix);
-        tracing::debug!(?key, "adding to delta_1");
-        delta_1.put_raw(key, [1u8; 12].to_vec());
-    }
-    let write_batch_1 = storage.prepare_commit(delta_1).await?;
-    let version_1 = write_batch_1.version();
-    let root_hash_1 = write_batch_1.root_hash().clone();
-
-    assert_eq!(version_1, initial_version.wrapping_add(1));
-    assert_ne!(root_hash_1.0, initial_root_hash.0);
-    for prefix in substore_prefixes.iter() {
-        assert_eq!(
-            write_batch_1
-                .substore_version(prefix)
-                .expect("substore exists"),
-            initial_version.wrapping_add(1)
-        )
-    }
-
-    // We check that merely preparing a batch does not write anything.
-    let state_snapshot = storage.latest_snapshot();
-    assert_eq!(state_snapshot.version(), initial_version);
-    assert_eq!(state_snapshot.root_hash().await?.0, initial_root_hash.0);
-
-    /* We create a new delta that writes no keys */
-    let delta_2 = StateDelta::new(state_snapshot.clone());
-    let write_batch_2 = storage.prepare_commit(delta_2).await?;
-    let version_2 = write_batch_2.version();
-    let root_hash_2 = write_batch_2.root_hash();
-    assert_eq!(version_2, initial_version.wrapping_add(1));
-    assert_ne!(root_hash_2.0, initial_root_hash.0);
-    assert_eq!(write_batch_2.version(), initial_version.wrapping_add(1));
-    for prefix in substore_prefixes.iter() {
-        assert_eq!(
-            write_batch_2
-                .substore_version(prefix)
-                .expect("substore exists"),
-            initial_version
-        )
-    }
-
-    let block_1_root = storage
-        .commit_batch(write_batch_1)
-        .expect("committing batch 3 should work");
-    let block_1_snapshot = storage.latest_snapshot();
-    let block_1_version = block_1_snapshot.version();
-    assert_eq!(root_hash_1.0, block_1_root.0);
-    assert_eq!(root_hash_1.0, block_1_snapshot.root_hash().await?.0);
-    assert_eq!(version_1, block_1_version);
-    assert!(
-        storage.commit_batch(write_batch_2).is_err(),
-        "committing batch 2 should fail"
-    );
-
-    /* We create an empty delta that writes no keys. */
-    let delta_3 = StateDelta::new(block_1_snapshot);
-    let write_batch_3 = storage.prepare_commit(delta_3).await?;
-    let version_3 = write_batch_3.version();
-    let root_hash_3 = write_batch_3.root_hash().clone();
-    assert_eq!(version_3, block_1_version.wrapping_add(1));
-
-    /* Check that we can apply `write_batch_3` */
-    let block_2_root = storage
-        .commit_batch(write_batch_3)
-        .expect("committing batch 3 should work");
-    let block_2_snapshot = storage.latest_snapshot();
-    let block_2_version = block_2_snapshot.version();
-    assert_eq!(root_hash_3.0, block_2_root.0);
-    assert_eq!(root_hash_3.0, block_2_snapshot.root_hash().await?.0);
-    assert_eq!(version_3, block_2_version);
-    Ok(())
-}
-
-#[tokio::test]
-/// Test that we can write prepare-commit batches that write to every
-/// substore.
-/// Intuition: we want to make sure that the version check that guards us from
-/// writing stale batches, is working as expected.
-pub async fn test_batch_substore() -> Result<()> {
-    let _ = tracing_subscriber::fmt::try_init();
-    let tmpdir = tempfile::tempdir()?;
-    let db_path = tmpdir.into_path();
-    let substore_prefixes = vec![
-        "ibc".to_string(),
-        "dex".to_string(),
-        "misc".to_string(),
-        "cometbft-data".to_string(),
-    ];
-    let storage = Storage::load(db_path.clone(), substore_prefixes.clone()).await?;
-    let initial_snapshot = storage.latest_snapshot();
-    let initial_version = initial_snapshot.version();
-    let initial_root_hash = initial_snapshot.root_hash().await?;
-    assert_eq!(
-        initial_version,
-        u64::MAX,
-        "initial version should be u64::MAX"
-    );
-    assert_eq!(initial_root_hash.0, [0u8; 32]);
-
-    for i in 0..100 {
-        let snapshot = storage.latest_snapshot();
-        let prev_version = snapshot.version();
-        let prev_root = snapshot
-            .root_hash()
-            .await
-            .expect("a root hash is available");
-
-        let mut delta = StateDelta::new(snapshot);
-        for substore_prefix in substore_prefixes.iter() {
-            let key = format!("{}/key_{i}", substore_prefix);
-            tracing::debug!(?key, index = i, "adding to delta");
-            delta.put_raw(key, [1u8; 12].to_vec());
-        }
-        let write_batch = storage.prepare_commit(delta).await?;
-        let next_version = write_batch.version();
-        let next_root = write_batch.root_hash().clone();
-
-        assert_eq!(next_version, prev_version.wrapping_add(1));
-        assert_ne!(next_root.0, prev_root.0);
-        for prefix in substore_prefixes.iter() {
-            assert_eq!(
-                write_batch
-                    .substore_version(prefix)
-                    .expect("substore exists"),
-                prev_version.wrapping_add(1)
-            )
-        }
-
-        // We check that merely preparing a batch does not write anything.
-        let state_snapshot = storage.latest_snapshot();
-        assert_eq!(state_snapshot.version(), prev_version);
-        assert_eq!(state_snapshot.root_hash().await?.0, prev_root.0);
-
-        let block_root = storage
-            .commit_batch(write_batch)
-            .expect("committing batch 3 should work");
-        let block_snapshot = storage.latest_snapshot();
-        let block_version = block_snapshot.version();
-        assert_eq!(next_root.0, block_root.0);
-        assert_eq!(next_root.0, block_snapshot.root_hash().await?.0);
-        assert_eq!(next_version, block_version);
-    }
-
-    Ok(())
-}
diff --git a/crates/core/app/Cargo.toml b/crates/core/app/Cargo.toml
index 9013371d07..002ec2f651 100644
--- a/crates/core/app/Cargo.toml
+++ b/crates/core/app/Cargo.toml
@@ -97,7 +97,7 @@ tonic                            = { workspace = true, optional = true }
 tonic-reflection                 = { workspace = true, optional = true }
 tonic-web                        = { workspace = true, optional = true }
 tower                            = { workspace = true, features = ["full"] }
-tower-abci                       = "0.11"
+tower-abci                       = "0.18"
 tower-actor                      = "0.1.0"
 tower-service                    = { workspace = true }
 tracing                          = { workspace = true }
@@ -121,7 +121,7 @@ rand_core                        = { workspace = true }
 tap                              = { workspace = true }
 tempfile                         = { workspace = true }
 tendermint-config                = { workspace = true }
-tower-http                       = { workspace = true }
+tower-http                       = { workspace = true, features = ["cors"] }
 tracing-subscriber               = { workspace = true }
 url                              = { workspace = true }
 
diff --git a/crates/core/app/src/rpc.rs b/crates/core/app/src/rpc.rs
index 90c1b26f1f..c8a0d9ea32 100644
--- a/crates/core/app/src/rpc.rs
+++ b/crates/core/app/src/rpc.rs
@@ -10,16 +10,18 @@ use {
     self::query::AppQueryServer,
     crate::PenumbraHost,
     anyhow::Context,
-    cnidarium::rpc::{
-        proto::v1::query_service_server::QueryServiceServer as StorageQueryServiceServer,
-        Server as StorageServer,
-    },
-    ibc_proto::cosmos::bank::v1beta1::query_server::QueryServer as TransferQueryServer,
-    ibc_proto::ibc::applications::transfer::v1::query_server::QueryServer as BankQueryServer,
-    ibc_proto::ibc::core::{
-        channel::v1::query_server::QueryServer as ChannelQueryServer,
-        client::v1::query_server::QueryServer as ClientQueryServer,
-        connection::v1::query_server::QueryServer as ConnectionQueryServer,
+    cnidarium::proto::v1::query_service_server::QueryServiceServer as StorageQueryServiceServer,
+    cnidarium::rpc::Server as StorageServer,
+    ibc_proto::{
+        cosmos::bank::v1beta1::query_server::QueryServer as TransferQueryServer,
+        ibc::{
+            applications::transfer::v1::query_server::QueryServer as BankQueryServer,
+            core::{
+                channel::v1::query_server::QueryServer as ChannelQueryServer,
+                client::v1::query_server::QueryServer as ClientQueryServer,
+                connection::v1::query_server::QueryServer as ConnectionQueryServer,
+            },
+        },
     },
     penumbra_auction::component::rpc::Server as AuctionServer,
     penumbra_compact_block::component::rpc::Server as CompactBlockServer,
@@ -50,28 +52,19 @@ use {
     penumbra_sct::component::rpc::Server as SctServer,
     penumbra_shielded_pool::component::rpc::Server as ShieldedPoolServer,
     penumbra_stake::component::rpc::Server as StakeServer,
-    penumbra_tower_trace::remote_addr,
+    tonic::service::Routes,
     tonic_web::enable as we,
 };
 
-pub fn router(
+pub fn routes(
     storage: &cnidarium::Storage,
     tm_proxy: impl TendermintProxyService,
     _enable_expensive_rpc: bool,
-) -> anyhow::Result<tonic::transport::server::Router> {
+) -> anyhow::Result<tonic::service::Routes> {
     let ibc = penumbra_ibc::component::rpc::IbcQuery::<PenumbraHost>::new(storage.clone());
-    let grpc_server = tonic::transport::server::Server::builder()
-        .trace_fn(|req| match remote_addr(req) {
-            Some(remote_addr) => {
-                tracing::error_span!("grpc", ?remote_addr)
-            }
-            None => tracing::error_span!("grpc"),
-        })
-        // Allow HTTP/1, which will be used by grpc-web connections.
-        // This is particularly important when running locally, as gRPC
-        // typically uses HTTP/2, which requires HTTPS. Accepting HTTP/2
-        // allows local applications such as web browsers to talk to pd.
-        .accept_http1(true)
+
+    let mut builder = Routes::builder();
+    builder
         // As part of #2932, we are disabling all timeouts until we circle back to our
         // performance story.
         // Sets a timeout for all gRPC requests, but note that in the case of streaming
@@ -125,8 +118,7 @@ pub fn router(
         ))))
         .add_service(we(tonic_reflection::server::Builder::configure()
             .register_encoded_file_descriptor_set(penumbra_proto::FILE_DESCRIPTOR_SET)
-            .build()
+            .build_v1()
             .with_context(|| "could not configure grpc reflection service")?));
-
-    Ok(grpc_server)
+    Ok(builder.routes().prepare())
 }
diff --git a/crates/core/app/src/server/consensus.rs b/crates/core/app/src/server/consensus.rs
index 5eae5010fc..7f5c7983a3 100644
--- a/crates/core/app/src/server/consensus.rs
+++ b/crates/core/app/src/server/consensus.rs
@@ -25,7 +25,10 @@ fn trace_events(events: &[Event]) {
         let span = tracing::debug_span!("event", kind = ?event.kind);
         span.in_scope(|| {
             for attr in &event.attributes {
-                tracing::debug!(k = ?attr.key, v=?attr.value);
+                tracing::debug!(
+                    k = %String::from_utf8_lossy(attr.key_bytes()),
+                    v = %String::from_utf8_lossy(attr.value_bytes()),
+                );
             }
         })
     }
diff --git a/crates/core/app/src/server/events.rs b/crates/core/app/src/server/events.rs
index 906f3d855c..7c8732ce9e 100644
--- a/crates/core/app/src/server/events.rs
+++ b/crates/core/app/src/server/events.rs
@@ -38,14 +38,27 @@ impl EventIndexLayer {
                 // Perform matching on a nested key in the same format used by
                 // the cosmos SDK: https://docs.cosmos.network/main/core/config
                 // e.g., "message.sender", "message.recipient"
-                let nested_key = format!("{}.{}", e.kind, attr.key);
 
-                if self.no_index.is_match(&nested_key) {
-                    attr.index = false;
-                }
-                // This comes second so that explicit index requests take priority over no-index requests.
-                if self.index.is_match(&nested_key) {
-                    attr.index = true;
+                // XXX: tendermint-rs now supports v034 events types, which are
+                //      plain bytes and need not be utf8. This messes with the
+                //      regex and is likely not desirable to have in downstream
+                //      consumers of the indexed events.
+                match attr.key_str() {
+                    Ok(key) => {
+                        let nested_key = format!("{}.{}", e.kind, key);
+
+                        if self.no_index.is_match(&nested_key) {
+                            attr.set_index(false)
+                        }
+                        // This comes second so that explicit index requests take priority over no-index requests.
+                        if self.index.is_match(&nested_key) {
+                            attr.set_index(false)
+                        }
+                    }
+                    // TODO: what should be done with this error? Emit a warning?
+                    Err(_err) => {
+                        attr.set_index(false);
+                    }
                 }
             }
         }
diff --git a/crates/core/app/src/server/info.rs b/crates/core/app/src/server/info.rs
index 90e090a7c8..63c3c7ae88 100644
--- a/crates/core/app/src/server/info.rs
+++ b/crates/core/app/src/server/info.rs
@@ -259,6 +259,7 @@ impl Info {
                         channel_id: chan_id,
                         port_id: PortId::transfer(),
                         channel_end: channel,
+                        upgrade_sequence: 0,
                     };
                     channels.push(id_chan.into());
                 }
@@ -308,6 +309,7 @@ impl Info {
                             channel_id: chan_id,
                             port_id: PortId::transfer(),
                             channel_end: channel,
+                            upgrade_sequence: 0,
                         };
                         channels.push(id_chan.into());
                     }
diff --git a/crates/core/app/tests/app_can_sweep_a_collection_of_small_notes.rs b/crates/core/app/tests/app_can_sweep_a_collection_of_small_notes.rs
index dfe096bdde..1a2ae423cb 100644
--- a/crates/core/app/tests/app_can_sweep_a_collection_of_small_notes.rs
+++ b/crates/core/app/tests/app_can_sweep_a_collection_of_small_notes.rs
@@ -95,12 +95,12 @@ async fn app_can_sweep_a_collection_of_small_notes() -> anyhow::Result<()> {
 
     // Spawn the server-side view server.
     {
-        let make_svc = penumbra_app::rpc::router(
+        let make_svc = penumbra_app::rpc::routes(
             storage.as_ref(),
             proxy,
             false, /*enable_expensive_rpc*/
         )?
-        .into_router()
+        .into_axum_router()
         .layer(tower_http::cors::CorsLayer::permissive())
         .into_make_service()
         .tap(|_| tracing::debug!("initialized rpc service"));
diff --git a/crates/core/app/tests/common/ibc_tests/node.rs b/crates/core/app/tests/common/ibc_tests/node.rs
index 5178c7dd3f..971b798bed 100644
--- a/crates/core/app/tests/common/ibc_tests/node.rs
+++ b/crates/core/app/tests/common/ibc_tests/node.rs
@@ -112,12 +112,12 @@ impl TestNodeWithIBC {
         tracing::info!("spawning gRPC...");
         // Spawn the node's RPC server.
         let _rpc_server = {
-            let make_svc = penumbra_app::rpc::router(
+            let make_svc = penumbra_app::rpc::routes(
                 storage.as_ref(),
                 proxy,
                 false, /*enable_expensive_rpc*/
             )?
-            .into_router()
+            .into_axum_router()
             .layer(tower_http::cors::CorsLayer::permissive())
             .into_make_service()
             .tap(|_| tracing::info!("initialized rpc service"));
@@ -125,6 +125,7 @@ impl TestNodeWithIBC {
                 .socket_addrs(|| None)?
                 .try_into()
                 .expect("grpc url can be turned into a socket address");
+
             let server = axum_server::bind(addr).serve(make_svc);
             tokio::spawn(async { server.await.expect("grpc server returned an error") })
                 .tap(|_| tracing::info!("grpc server is running"))
diff --git a/crates/core/app/tests/common/ibc_tests/relayer.rs b/crates/core/app/tests/common/ibc_tests/relayer.rs
index 4b76f6d0d3..49e8307362 100644
--- a/crates/core/app/tests/common/ibc_tests/relayer.rs
+++ b/crates/core/app/tests/common/ibc_tests/relayer.rs
@@ -1562,16 +1562,18 @@ impl MockRelayer {
                 let mut timeout_height_on_b = None;
                 let mut timeout_timestamp_on_b = None;
                 for attr in &event.attributes {
-                    match attr.key.as_str() {
-                        "packet_data_hex" => packet_data_hex = Some(attr.value.clone()),
-                        "packet_sequence" => sequence = Some(attr.value.clone()),
-                        "packet_src_port" => port_on_a = Some(attr.value.clone()),
-                        "packet_src_channel" => chan_on_a = Some(attr.value.clone()),
-                        "packet_dst_port" => port_on_b = Some(attr.value.clone()),
-                        "packet_dst_channel" => chan_on_b = Some(attr.value.clone()),
-                        "packet_timeout_height" => timeout_height_on_b = Some(attr.value.clone()),
+                    match attr.key_str()? {
+                        "packet_data_hex" => packet_data_hex = Some(attr.value_str()?.to_string()),
+                        "packet_sequence" => sequence = Some(attr.value_str()?.to_string()),
+                        "packet_src_port" => port_on_a = Some(attr.value_str()?.to_string()),
+                        "packet_src_channel" => chan_on_a = Some(attr.value_str()?.to_string()),
+                        "packet_dst_port" => port_on_b = Some(attr.value_str()?.to_string()),
+                        "packet_dst_channel" => chan_on_b = Some(attr.value_str()?.to_string()),
+                        "packet_timeout_height" => {
+                            timeout_height_on_b = Some(attr.value_str()?.to_string())
+                        }
                         "packet_timeout_timestamp" => {
-                            timeout_timestamp_on_b = Some(attr.value.clone())
+                            timeout_timestamp_on_b = Some(attr.value_str()?.to_string())
                         }
                         _ => (),
                     }
@@ -1673,18 +1675,20 @@ impl MockRelayer {
                 let mut timeout_timestamp_on_b = None;
                 let mut packet_ack_hex = None;
                 for attr in &event.attributes {
-                    match attr.key.as_str() {
-                        "packet_data_hex" => packet_data_hex = Some(attr.value.clone()),
-                        "packet_sequence" => sequence = Some(attr.value.clone()),
-                        "packet_src_port" => port_on_a = Some(attr.value.clone()),
-                        "packet_src_channel" => chan_on_a = Some(attr.value.clone()),
-                        "packet_dst_port" => port_on_b = Some(attr.value.clone()),
-                        "packet_dst_channel" => chan_on_b = Some(attr.value.clone()),
-                        "packet_timeout_height" => timeout_height_on_b = Some(attr.value.clone()),
+                    match attr.key_str()? {
+                        "packet_data_hex" => packet_data_hex = Some(attr.value_str()?.to_string()),
+                        "packet_sequence" => sequence = Some(attr.value_str()?.to_string()),
+                        "packet_src_port" => port_on_a = Some(attr.value_str()?.to_string()),
+                        "packet_src_channel" => chan_on_a = Some(attr.value_str()?.to_string()),
+                        "packet_dst_port" => port_on_b = Some(attr.value_str()?.to_string()),
+                        "packet_dst_channel" => chan_on_b = Some(attr.value_str()?.to_string()),
+                        "packet_timeout_height" => {
+                            timeout_height_on_b = Some(attr.value_str()?.to_string())
+                        }
                         "packet_timeout_timestamp" => {
-                            timeout_timestamp_on_b = Some(attr.value.clone())
+                            timeout_timestamp_on_b = Some(attr.value_str()?.to_string())
                         }
-                        "packet_ack_hex" => packet_ack_hex = Some(attr.value.clone()),
+                        "packet_ack_hex" => packet_ack_hex = Some(attr.value_str()?.to_string()),
                         _ => (),
                     }
                 }
diff --git a/crates/core/app/tests/mock_consensus_block_proving.rs b/crates/core/app/tests/mock_consensus_block_proving.rs
index f522020769..6966ba96f3 100644
--- a/crates/core/app/tests/mock_consensus_block_proving.rs
+++ b/crates/core/app/tests/mock_consensus_block_proving.rs
@@ -1,5 +1,8 @@
 use {
     anyhow::Context as _,
+    cnidarium::proto::v1::{
+        query_service_client::QueryServiceClient as CnidariumQueryServiceClient, KeyValueRequest,
+    },
     cnidarium::{StateRead as _, TempStorage},
     common::{BuilderExt as _, TempStorageExt as _},
     ibc_proto::ibc::core::client::v1::{
@@ -23,10 +26,6 @@ use {
     penumbra_mock_client::MockClient,
     penumbra_mock_consensus::TestNode,
     penumbra_proto::{
-        cnidarium::v1::{
-            query_service_client::QueryServiceClient as CnidariumQueryServiceClient,
-            KeyValueRequest,
-        },
         util::tendermint_proxy::v1::{
             tendermint_proxy_service_client::TendermintProxyServiceClient, GetBlockByHeightRequest,
         },
@@ -191,8 +190,8 @@ async fn verify_storage_proof_simple() -> anyhow::Result<()> {
     // Spawn the node's RPC server.
     let _rpc_server = {
         let make_svc =
-            penumbra_app::rpc::router(&storage, proxy, false /*enable_expensive_rpc*/)?
-                .into_router()
+            penumbra_app::rpc::routes(&storage, proxy, false /*enable_expensive_rpc*/)?
+                .into_axum_router()
                 .layer(tower_http::cors::CorsLayer::permissive())
                 .into_make_service()
                 .tap(|_| println!("initialized rpc service"));
diff --git a/crates/core/app/tests/view_server_can_be_served_on_localhost.rs b/crates/core/app/tests/view_server_can_be_served_on_localhost.rs
index 6ef2571ac3..4603aadf1c 100644
--- a/crates/core/app/tests/view_server_can_be_served_on_localhost.rs
+++ b/crates/core/app/tests/view_server_can_be_served_on_localhost.rs
@@ -71,12 +71,12 @@ async fn view_server_can_be_served_on_localhost() -> anyhow::Result<()> {
 
     // Spawn the server-side view server.
     {
-        let make_svc = penumbra_app::rpc::router(
+        let make_svc = penumbra_app::rpc::routes(
             storage.as_ref(),
             proxy,
             false, /*enable_expensive_rpc*/
         )?
-        .into_router()
+        .into_axum_router()
         .layer(tower_http::cors::CorsLayer::permissive())
         .into_make_service()
         .tap(|_| tracing::debug!("initialized rpc service"));
diff --git a/crates/core/component/auction/Cargo.toml b/crates/core/component/auction/Cargo.toml
index df57c248d2..65cc933d2f 100644
--- a/crates/core/component/auction/Cargo.toml
+++ b/crates/core/component/auction/Cargo.toml
@@ -55,6 +55,7 @@ hex = {workspace = true}
 im = {workspace = true, optional = true}
 metrics = {workspace = true}
 once_cell = {workspace = true}
+pbjson-types = { workspace = true }
 penumbra-asset = {workspace = true, default-features = false}
 penumbra-keys = {workspace = true, default-features = false}
 penumbra-num = {workspace = true, default-features = false}
@@ -76,7 +77,6 @@ tendermint = {workspace = true, default-features = true}
 tokio = {workspace = true, features = ["full", "tracing"], optional = true}
 tonic = {workspace = true, optional = true}
 tracing = {workspace = true}
-pbjson-types = "0.6.0"
 
 [dev-dependencies]
 ed25519-consensus = {workspace = true}
diff --git a/crates/core/component/ibc/src/component/msg_handler/channel_close_confirm.rs b/crates/core/component/ibc/src/component/msg_handler/channel_close_confirm.rs
index 8d8e53fd0e..1cd8eff2d9 100644
--- a/crates/core/component/ibc/src/component/msg_handler/channel_close_confirm.rs
+++ b/crates/core/component/ibc/src/component/msg_handler/channel_close_confirm.rs
@@ -70,6 +70,7 @@ impl MsgHandler for MsgChannelCloseConfirm {
             remote: expected_counterparty,
             connection_hops: expected_connection_hops,
             version: channel.version.clone(),
+            ..ChannelEnd::default()
         };
 
         state
diff --git a/crates/core/component/ibc/src/component/msg_handler/channel_open_ack.rs b/crates/core/component/ibc/src/component/msg_handler/channel_open_ack.rs
index 3e7accd673..4f9c96b8f4 100644
--- a/crates/core/component/ibc/src/component/msg_handler/channel_open_ack.rs
+++ b/crates/core/component/ibc/src/component/msg_handler/channel_open_ack.rs
@@ -58,6 +58,7 @@ impl MsgHandler for MsgChannelOpenAck {
             remote: expected_counterparty,
             connection_hops: expected_connection_hops,
             version: self.version_on_b.clone(),
+            ..ChannelEnd::default()
         };
 
         state
diff --git a/crates/core/component/ibc/src/component/msg_handler/channel_open_confirm.rs b/crates/core/component/ibc/src/component/msg_handler/channel_open_confirm.rs
index 3d5f47bc6e..b941ebd9ac 100644
--- a/crates/core/component/ibc/src/component/msg_handler/channel_open_confirm.rs
+++ b/crates/core/component/ibc/src/component/msg_handler/channel_open_confirm.rs
@@ -65,6 +65,7 @@ impl MsgHandler for MsgChannelOpenConfirm {
             remote: expected_counterparty,
             connection_hops: expected_connection_hops,
             version: channel.version.clone(),
+            ..ChannelEnd::default()
         };
 
         state
diff --git a/crates/core/component/ibc/src/component/msg_handler/channel_open_init.rs b/crates/core/component/ibc/src/component/msg_handler/channel_open_init.rs
index 6956aabf7a..e97c1697b9 100644
--- a/crates/core/component/ibc/src/component/msg_handler/channel_open_init.rs
+++ b/crates/core/component/ibc/src/component/msg_handler/channel_open_init.rs
@@ -57,6 +57,7 @@ impl MsgHandler for MsgChannelOpenInit {
             remote: Counterparty::new(self.port_id_on_b.clone(), None),
             connection_hops: self.connection_hops_on_a.clone(),
             version: self.version_proposal.clone(),
+            ..ChannelEnd::default()
         };
 
         state.put_channel(&channel_id, &self.port_id_on_a, new_channel.clone());
diff --git a/crates/core/component/ibc/src/component/msg_handler/channel_open_try.rs b/crates/core/component/ibc/src/component/msg_handler/channel_open_try.rs
index 3432c98760..8bffd067fd 100644
--- a/crates/core/component/ibc/src/component/msg_handler/channel_open_try.rs
+++ b/crates/core/component/ibc/src/component/msg_handler/channel_open_try.rs
@@ -49,6 +49,7 @@ impl MsgHandler for MsgChannelOpenTry {
                 .clone()
                 .ok_or_else(|| anyhow::anyhow!("no counterparty connection id provided"))?],
             version: self.version_supported_on_a.clone(),
+            ..ChannelEnd::default()
         };
 
         tracing::debug!(?self, ?expected_channel_on_a);
@@ -81,6 +82,7 @@ impl MsgHandler for MsgChannelOpenTry {
             remote: Counterparty::new(self.port_id_on_a.clone(), Some(self.chan_id_on_a.clone())),
             connection_hops: self.connection_hops_on_b.clone(),
             version: self.version_supported_on_a.clone(),
+            ..ChannelEnd::default()
         };
 
         state.put_channel(&channel_id, &self.port_id_on_b, new_channel.clone());
diff --git a/crates/core/component/ibc/src/component/rpc.rs b/crates/core/component/ibc/src/component/rpc.rs
index 4b54f52105..acb38b1bdb 100644
--- a/crates/core/component/ibc/src/component/rpc.rs
+++ b/crates/core/component/ibc/src/component/rpc.rs
@@ -1,5 +1,5 @@
 use cnidarium::Storage;
-use tonic::transport::server::Routes;
+use tonic::service::Routes;
 
 use super::HostInterface;
 
diff --git a/crates/core/component/ibc/src/component/rpc/consensus_query.rs b/crates/core/component/ibc/src/component/rpc/consensus_query.rs
index 4b176acfb4..5336d14204 100644
--- a/crates/core/component/ibc/src/component/rpc/consensus_query.rs
+++ b/crates/core/component/ibc/src/component/rpc/consensus_query.rs
@@ -4,7 +4,8 @@ use async_trait::async_trait;
 use ibc_proto::ibc::core::channel::v1::query_server::Query as ConsensusQuery;
 use ibc_proto::ibc::core::channel::v1::{
     Channel, PacketState, QueryChannelClientStateRequest, QueryChannelClientStateResponse,
-    QueryChannelConsensusStateRequest, QueryChannelConsensusStateResponse, QueryChannelRequest,
+    QueryChannelConsensusStateRequest, QueryChannelConsensusStateResponse,
+    QueryChannelParamsRequest, QueryChannelParamsResponse, QueryChannelRequest,
     QueryChannelResponse, QueryChannelsRequest, QueryChannelsResponse,
     QueryConnectionChannelsRequest, QueryConnectionChannelsResponse,
     QueryNextSequenceReceiveRequest, QueryNextSequenceReceiveResponse,
@@ -14,6 +15,7 @@ use ibc_proto::ibc::core::channel::v1::{
     QueryPacketCommitmentResponse, QueryPacketCommitmentsRequest, QueryPacketCommitmentsResponse,
     QueryPacketReceiptRequest, QueryPacketReceiptResponse, QueryUnreceivedAcksRequest,
     QueryUnreceivedAcksResponse, QueryUnreceivedPacketsRequest, QueryUnreceivedPacketsResponse,
+    QueryUpgradeErrorRequest, QueryUpgradeErrorResponse, QueryUpgradeRequest, QueryUpgradeResponse,
 };
 use ibc_proto::ibc::core::client::v1::{Height, IdentifiedClientState};
 use ibc_types::path::{
@@ -130,6 +132,7 @@ impl<HI: HostInterface + Send + Sync + 'static> ConsensusQuery for IbcQuery<HI>
                 channel_id: chan_id,
                 port_id: PortId::transfer(),
                 channel_end: channel,
+                upgrade_sequence: 0,
             };
             channels.push(id_chan.into());
         }
@@ -187,6 +190,7 @@ impl<HI: HostInterface + Send + Sync + 'static> ConsensusQuery for IbcQuery<HI>
                     channel_id: chan_id,
                     port_id: PortId::transfer(),
                     channel_end: channel,
+                    upgrade_sequence: 0,
                 };
                 channels.push(id_chan.into());
             }
@@ -856,4 +860,28 @@ impl<HI: HostInterface + Send + Sync + 'static> ConsensusQuery for IbcQuery<HI>
             }),
         }))
     }
+
+    #[tracing::instrument(skip(self), err, level = "debug")]
+    async fn channel_params(
+        &self,
+        _request: tonic::Request<QueryChannelParamsRequest>,
+    ) -> std::result::Result<tonic::Response<QueryChannelParamsResponse>, tonic::Status> {
+        Err(tonic::Status::unimplemented("not implemented"))
+    }
+
+    #[tracing::instrument(skip(self), err, level = "debug")]
+    async fn upgrade(
+        &self,
+        _request: tonic::Request<QueryUpgradeRequest>,
+    ) -> std::result::Result<tonic::Response<QueryUpgradeResponse>, tonic::Status> {
+        Err(tonic::Status::unimplemented("not implemented"))
+    }
+
+    #[tracing::instrument(skip(self), err, level = "debug")]
+    async fn upgrade_error(
+        &self,
+        _request: tonic::Request<QueryUpgradeErrorRequest>,
+    ) -> std::result::Result<tonic::Response<QueryUpgradeErrorResponse>, tonic::Status> {
+        Err(tonic::Status::unimplemented("not implemented"))
+    }
 }
diff --git a/crates/core/component/shielded-pool/Cargo.toml b/crates/core/component/shielded-pool/Cargo.toml
index d1a9b72f81..58deecfe28 100644
--- a/crates/core/component/shielded-pool/Cargo.toml
+++ b/crates/core/component/shielded-pool/Cargo.toml
@@ -12,6 +12,7 @@ component = [
     "penumbra-sct/component",
     "tonic",
     "ibc-proto/server",
+    "ibc-proto/transport",
 ]
 # proving-keys = ["penumbra-proof-params/proving-keys"]
 default = ["std", "component"]
diff --git a/crates/core/component/shielded-pool/src/component/rpc/bank_query.rs b/crates/core/component/shielded-pool/src/component/rpc/bank_query.rs
index 2af2edae7c..a675402ecd 100644
--- a/crates/core/component/shielded-pool/src/component/rpc/bank_query.rs
+++ b/crates/core/component/shielded-pool/src/component/rpc/bank_query.rs
@@ -9,9 +9,11 @@ use ibc_proto::cosmos::bank::v1beta1::{
     QueryTotalSupplyRequest, QueryTotalSupplyResponse,
 };
 use ibc_proto::cosmos::bank::v1beta1::{
-    QueryDenomMetadataRequest, QueryDenomMetadataResponse, QueryDenomOwnersRequest,
-    QueryDenomOwnersResponse, QueryDenomsMetadataRequest, QueryDenomsMetadataResponse,
-    QuerySendEnabledRequest, QuerySendEnabledResponse, QuerySpendableBalanceByDenomRequest,
+    QueryDenomMetadataByQueryStringRequest, QueryDenomMetadataByQueryStringResponse,
+    QueryDenomMetadataRequest, QueryDenomMetadataResponse, QueryDenomOwnersByQueryRequest,
+    QueryDenomOwnersByQueryResponse, QueryDenomOwnersRequest, QueryDenomOwnersResponse,
+    QueryDenomsMetadataRequest, QueryDenomsMetadataResponse, QuerySendEnabledRequest,
+    QuerySendEnabledResponse, QuerySpendableBalanceByDenomRequest,
     QuerySpendableBalanceByDenomResponse, QuerySpendableBalancesRequest,
     QuerySpendableBalancesResponse, QuerySupplyOfRequest, QuerySupplyOfResponse,
 };
@@ -207,4 +209,18 @@ impl BankQuery for Server {
     ) -> std::result::Result<tonic::Response<QuerySendEnabledResponse>, tonic::Status> {
         Err(tonic::Status::unimplemented("not implemented"))
     }
+
+    async fn denom_metadata_by_query_string(
+        &self,
+        _: tonic::Request<QueryDenomMetadataByQueryStringRequest>,
+    ) -> Result<tonic::Response<QueryDenomMetadataByQueryStringResponse>, tonic::Status> {
+        Err(tonic::Status::unimplemented("not implemented"))
+    }
+
+    async fn denom_owners_by_query(
+        &self,
+        _: tonic::Request<QueryDenomOwnersByQueryRequest>,
+    ) -> Result<tonic::Response<QueryDenomOwnersByQueryResponse>, tonic::Status> {
+        Err(tonic::Status::unimplemented("not implemented"))
+    }
 }
diff --git a/crates/core/keys/src/symmetric.rs b/crates/core/keys/src/symmetric.rs
index cc04585ed4..e16e726f74 100644
--- a/crates/core/keys/src/symmetric.rs
+++ b/crates/core/keys/src/symmetric.rs
@@ -135,7 +135,6 @@ impl TryFrom<&[u8]> for PayloadKey {
 
     fn try_from(slice: &[u8]) -> Result<Self, Self::Error> {
         let bytes: [u8; PAYLOAD_KEY_LEN_BYTES] = slice
-            .as_ref()
             .try_into()
             .map_err(|_| anyhow::anyhow!("PayloadKey incorrect len"))?;
         Ok(Self(*Key::from_slice(&bytes)))
diff --git a/crates/crypto/proof-params/Cargo.toml b/crates/crypto/proof-params/Cargo.toml
index af3bdaf815..8199e5caef 100644
--- a/crates/crypto/proof-params/Cargo.toml
+++ b/crates/crypto/proof-params/Cargo.toml
@@ -5,7 +5,7 @@ edition = {workspace = true}
 
 [build-dependencies]
 regex = { version = "1", optional = true }
-reqwest = { version = "0.11.14", optional = true, features = [
+reqwest = { version = "0.12.9", optional = true, features = [
     "blocking",
     "json",
 ] }
diff --git a/crates/misc/tct-visualize/Cargo.toml b/crates/misc/tct-visualize/Cargo.toml
index cbd2f4ffac..adb96c663f 100644
--- a/crates/misc/tct-visualize/Cargo.toml
+++ b/crates/misc/tct-visualize/Cargo.toml
@@ -21,7 +21,9 @@ tokio-util = {workspace = true, features = ["full"]}
 tonic = {workspace = true}
 prost = {workspace = true}
 tokio-stream = {workspace = true}
-axum = {workspace = true, features = ["headers", "query"]}
+axum = {workspace = true }
+# TODO: consider using the Query extractor provided by axum-extra
+axum-extra = {workspace = true, features = ["typed-header"] }
 axum-server = {workspace = true, features = ["tls-rustls"]}
 serde_json = {workspace = true, features = ["preserve_order"]}
 include-flate = { version = "0.1", features = ["stable"] }
diff --git a/crates/misc/tct-visualize/src/bin/tct-live-edit.rs b/crates/misc/tct-visualize/src/bin/tct-live-edit.rs
index e09b75cb9a..d529c91e3c 100644
--- a/crates/misc/tct-visualize/src/bin/tct-live-edit.rs
+++ b/crates/misc/tct-visualize/src/bin/tct-live-edit.rs
@@ -1,6 +1,7 @@
 use std::{path::PathBuf, sync::Arc};
 
-use axum::{headers::ContentType, routing::get, Router, TypedHeader};
+use axum::{routing::get, Router};
+use axum_extra::{headers::ContentType, TypedHeader};
 use axum_server::tls_rustls::RustlsConfig;
 use clap::Parser;
 use include_flate::flate;
@@ -79,8 +80,8 @@ async fn main() -> anyhow::Result<()> {
                 .unwrap()
         }
         (None, None) => {
-            axum::Server::bind(&address)
-                .serve(app.into_make_service())
+            let listener = tokio::net::TcpListener::bind(&address).await.unwrap();
+            axum::serve(listener, app.into_make_service())
                 .await
                 .unwrap();
         }
diff --git a/crates/misc/tct-visualize/src/live/view.rs b/crates/misc/tct-visualize/src/live/view.rs
index dc657b8b76..40606a0b7f 100644
--- a/crates/misc/tct-visualize/src/live/view.rs
+++ b/crates/misc/tct-visualize/src/live/view.rs
@@ -1,20 +1,20 @@
 use std::{convert::Infallible, sync::Arc, time::Duration};
 
 use axum::{
-    body::StreamBody,
+    body::Body,
     extract::{OriginalUri, Path, Query},
-    headers::ContentType,
     http::StatusCode,
     response::{
         sse::{self, KeepAlive},
         Sse,
     },
     routing::{get, MethodRouter},
-    Router, TypedHeader,
+    Router,
 };
+use axum_extra::{headers::ContentType, TypedHeader};
 
 use bytes::Bytes;
-use futures::stream;
+use futures::{future, stream};
 use serde_json::json;
 use tokio::sync::{mpsc, watch};
 use tokio_stream::{wrappers::ReceiverStream, StreamExt};
@@ -262,15 +262,14 @@ fn render_dot(mut tree: watch::Receiver<Tree>) -> MethodRouter {
         if !query.graph {
             return Ok::<_, (StatusCode, String)>((
                 TypedHeader(ContentType::json()),
-                StreamBody::new(
-                    stream::iter(vec![json!({
+                Body::from_stream(stream::once(future::ok::<_, Infallible>(
+                    json!({
                         "position": tree.borrow().position(),
                         "forgotten": tree.borrow().forgotten(),
                     })
                     .to_string()
-                    .into()])
-                    .map(Ok),
-                ),
+                    .into_bytes(),
+                ))),
             ));
         }
 
@@ -334,7 +333,7 @@ fn render_dot(mut tree: watch::Receiver<Tree>) -> MethodRouter {
             // Manually construct a streaming response to avoid allocating a copy of the large
             // rendered bytes: the graph is already rendered as a JSON-escaped string, so we include
             // it literally in this output
-            StreamBody::new(
+            Body::from_stream(
                 stream::iter(vec![
                     "{".into(),
                     "\"position\":".into(),
diff --git a/crates/proto/Cargo.toml b/crates/proto/Cargo.toml
index 64956328d2..ca137d5709 100644
--- a/crates/proto/Cargo.toml
+++ b/crates/proto/Cargo.toml
@@ -8,7 +8,7 @@ anyhow = "1"
 
 [features]
 rpc = ["dep:tonic", "ibc-proto/client"]
-box-grpc = ["dep:http-body", "dep:tonic", "dep:tower"]
+box-grpc = ["dep:http-body", "dep:http-body-util", "dep:tonic", "dep:tower"]
 cnidarium = ["dep:cnidarium"]
 tendermint = [
     "dep:chrono",
@@ -30,6 +30,7 @@ decaf377-rdsa = {workspace = true}
 futures = {workspace = true}
 hex = {workspace = true}
 http-body = {workspace = true, optional = true}
+http-body-util = {workspace = true, optional = true}
 ibc-types = {workspace = true, features = ["std"], default-features = true}
 ics23 = {workspace = true}
 pbjson = {workspace = true}
diff --git a/crates/proto/src/box_grpc_svc.rs b/crates/proto/src/box_grpc_svc.rs
index 1ce117449f..7c02a015dc 100644
--- a/crates/proto/src/box_grpc_svc.rs
+++ b/crates/proto/src/box_grpc_svc.rs
@@ -1,10 +1,7 @@
 use bytes::Bytes;
-use http_body::{combinators::UnsyncBoxBody, Body};
-use tonic::{
-    body::BoxBody as ReqBody,
-    codegen::http as grpc,
-    transport::{self, Endpoint},
-};
+use http_body::Body;
+use http_body_util::{combinators::UnsyncBoxBody, BodyExt as _};
+use tonic::{body::BoxBody as ReqBody, codegen::http as grpc, transport::Endpoint};
 use tower::{util::BoxCloneService, Service, ServiceBuilder};
 
 /// A type-erased gRPC service.
@@ -20,7 +17,7 @@ pub type RspBody = UnsyncBoxBody<Bytes, BoxError>;
 pub async fn connect(ep: Endpoint) -> anyhow::Result<BoxGrpcService> {
     let conn = ep.connect().await?;
     let svc = ServiceBuilder::new()
-        .map_response(|rsp: grpc::Response<transport::Body>| rsp.map(box_rsp_body))
+        .map_response(|rsp: grpc::Response<tonic::body::BoxBody>| rsp.map(box_rsp_body))
         .map_err(BoxError::from)
         .service(conn);
     Ok(BoxCloneService::new(svc))
diff --git a/crates/proto/src/event.rs b/crates/proto/src/event.rs
index e7e69fefa4..ce74895ce4 100644
--- a/crates/proto/src/event.rs
+++ b/crates/proto/src/event.rs
@@ -16,16 +16,19 @@ pub trait ProtoEvent: Message + Name + Serialize + DeserializeOwned + Sized {
             .as_object()
             .expect("serde_json Serialized ProtoEvent should not be empty.")
             .into_iter()
-            .map(|(key, v)| abci::EventAttribute {
-                value: serde_json::to_string(v).expect("must be able to serialize value as JSON"),
-                key: key.to_string(),
-                index: true,
+            .map(|(key, v)| {
+                abci::EventAttribute::V037(abci::v0_37::EventAttribute {
+                    value: serde_json::to_string(v)
+                        .expect("must be able to serialize value as JSON"),
+                    key: key.to_string(),
+                    index: true,
+                })
             })
             .collect();
 
         // NOTE: cosmo-sdk sorts the attribute list so that it's deterministic every time.[0] I don't know if that is actually conformant but continuing that pattern here for now.
         // [0]: https://github.com/cosmos/cosmos-sdk/blob/8fb62054c59e580c0ae0c898751f8dc46044499a/types/events.go#L102-L104
-        attributes.sort_by(|a, b| (&a.key).cmp(&b.key));
+        attributes.sort_by(|a, b| (&a.key_bytes()).cmp(&b.key_bytes()));
 
         return abci::Event::new(kind, attributes);
     }
@@ -43,9 +46,9 @@ pub trait ProtoEvent: Message + Name + Serialize + DeserializeOwned + Sized {
         // NOTE: Is there any condition where there would be duplicate EventAttributes and problems that fall out of that?
         let mut attributes = HashMap::<String, serde_json::Value>::new();
         for attr in &event.attributes {
-            let value = serde_json::from_str(&attr.value)
+            let value = serde_json::from_slice(attr.value_bytes())
                 .with_context(|| format!("could not parse JSON for attribute {:?}", attr))?;
-            attributes.insert(attr.key.clone(), value);
+            attributes.insert(String::from_utf8_lossy(attr.key_bytes()).into(), value);
         }
 
         let json = serde_json::to_value(attributes)
@@ -81,11 +84,11 @@ mod tests {
 
         let expected_abci_spend = abci::Event::new(
             "penumbra.core.component.shielded_pool.v1.EventSpend",
-            vec![abci::EventAttribute {
+            [abci::EventAttribute::V037(abci::v0_37::EventAttribute {
                 key: "nullifier".to_string(),
                 value: "{\"inner\":\"lL6VF1ZxmJFo8o6i6e+JjYyktGKaN6j/o+SzsBoZ29M=\"}".to_string(),
                 index: true,
-            }],
+            })],
         );
         assert_eq!(abci_spend, expected_abci_spend);
 
@@ -107,13 +110,13 @@ mod tests {
 
         let expected_abci_output = abci::Event::new(
             "penumbra.core.component.shielded_pool.v1.EventOutput",
-            vec![abci::EventAttribute {
+            [abci::EventAttribute::V037(abci::v0_37::EventAttribute {
                 // note: attribute keys become camelCase because ProtoJSON...
                 key: "noteCommitment".to_string(),
                 // note: attribute values are JSON objects, potentially nested as here
                 value: "{\"inner\":\"lL6VF1ZxmJFo8o6i6e+JjYyktGKaN6j/o+SzsBoZ29M=\"}".to_string(),
                 index: true,
-            }],
+            })],
         );
         assert_eq!(abci_output, expected_abci_output);
 
diff --git a/crates/proto/src/gen/cosmos.app.v1alpha1.rs b/crates/proto/src/gen/cosmos.app.v1alpha1.rs
index de74556a7a..a2b1826bb6 100644
--- a/crates/proto/src/gen/cosmos.app.v1alpha1.rs
+++ b/crates/proto/src/gen/cosmos.app.v1alpha1.rs
@@ -1,5 +1,5 @@
+// This file is @generated by prost-build.
 /// ModuleDescriptor describes an app module.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ModuleDescriptor {
     /// go_import names the package that should be imported by an app to load the
@@ -27,11 +27,13 @@ impl ::prost::Name for ModuleDescriptor {
     const NAME: &'static str = "ModuleDescriptor";
     const PACKAGE: &'static str = "cosmos.app.v1alpha1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.app.v1alpha1.{}", Self::NAME)
+        "cosmos.app.v1alpha1.ModuleDescriptor".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.app.v1alpha1.ModuleDescriptor".into()
     }
 }
 /// PackageReference is a reference to a protobuf package used by a module.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PackageReference {
     /// name is the fully-qualified name of the package.
@@ -80,12 +82,14 @@ impl ::prost::Name for PackageReference {
     const NAME: &'static str = "PackageReference";
     const PACKAGE: &'static str = "cosmos.app.v1alpha1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.app.v1alpha1.{}", Self::NAME)
+        "cosmos.app.v1alpha1.PackageReference".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.app.v1alpha1.PackageReference".into()
     }
 }
 /// MigrateFromInfo is information on a module version that a newer module
 /// can migrate from.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MigrateFromInfo {
     /// module is the fully-qualified protobuf name of the module config object
@@ -97,6 +101,9 @@ impl ::prost::Name for MigrateFromInfo {
     const NAME: &'static str = "MigrateFromInfo";
     const PACKAGE: &'static str = "cosmos.app.v1alpha1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.app.v1alpha1.{}", Self::NAME)
+        "cosmos.app.v1alpha1.MigrateFromInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.app.v1alpha1.MigrateFromInfo".into()
     }
 }
diff --git a/crates/proto/src/gen/cosmos.auth.v1beta1.rs b/crates/proto/src/gen/cosmos.auth.v1beta1.rs
index 494ee21f5f..eb18f17fee 100644
--- a/crates/proto/src/gen/cosmos.auth.v1beta1.rs
+++ b/crates/proto/src/gen/cosmos.auth.v1beta1.rs
@@ -1,7 +1,7 @@
+// This file is @generated by prost-build.
 /// BaseAccount defines a base account type. It contains all the necessary fields
 /// for basic account functionality. Any custom account type should extend this
 /// type for additional functionality (e.g. vesting).
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BaseAccount {
     #[prost(string, tag = "1")]
@@ -17,11 +17,13 @@ impl ::prost::Name for BaseAccount {
     const NAME: &'static str = "BaseAccount";
     const PACKAGE: &'static str = "cosmos.auth.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.auth.v1beta1.{}", Self::NAME)
+        "cosmos.auth.v1beta1.BaseAccount".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.auth.v1beta1.BaseAccount".into()
     }
 }
 /// ModuleAccount defines an account for modules that holds coins on a pool.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ModuleAccount {
     #[prost(message, optional, tag = "1")]
@@ -35,13 +37,15 @@ impl ::prost::Name for ModuleAccount {
     const NAME: &'static str = "ModuleAccount";
     const PACKAGE: &'static str = "cosmos.auth.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.auth.v1beta1.{}", Self::NAME)
+        "cosmos.auth.v1beta1.ModuleAccount".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.auth.v1beta1.ModuleAccount".into()
     }
 }
 /// ModuleCredential represents a unclaimable pubkey for base accounts controlled by modules.
 ///
 /// Since: cosmos-sdk 0.47
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ModuleCredential {
     /// module_name is the name of the module used for address derivation (passed into address.Module).
@@ -56,12 +60,14 @@ impl ::prost::Name for ModuleCredential {
     const NAME: &'static str = "ModuleCredential";
     const PACKAGE: &'static str = "cosmos.auth.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.auth.v1beta1.{}", Self::NAME)
+        "cosmos.auth.v1beta1.ModuleCredential".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.auth.v1beta1.ModuleCredential".into()
     }
 }
 /// Params defines the parameters for the auth module.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct Params {
     #[prost(uint64, tag = "1")]
     pub max_memo_characters: u64,
@@ -78,6 +84,9 @@ impl ::prost::Name for Params {
     const NAME: &'static str = "Params";
     const PACKAGE: &'static str = "cosmos.auth.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.auth.v1beta1.{}", Self::NAME)
+        "cosmos.auth.v1beta1.Params".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.auth.v1beta1.Params".into()
     }
 }
diff --git a/crates/proto/src/gen/cosmos.bank.v1beta1.rs b/crates/proto/src/gen/cosmos.bank.v1beta1.rs
index 1fdd67aa3c..113e4a0aa6 100644
--- a/crates/proto/src/gen/cosmos.bank.v1beta1.rs
+++ b/crates/proto/src/gen/cosmos.bank.v1beta1.rs
@@ -1,5 +1,5 @@
+// This file is @generated by prost-build.
 /// Params defines the parameters for the bank module.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Params {
     /// Deprecated: Use of SendEnabled in params is deprecated.
@@ -17,12 +17,14 @@ impl ::prost::Name for Params {
     const NAME: &'static str = "Params";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.Params".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.Params".into()
     }
 }
 /// SendEnabled maps coin denom to a send_enabled status (whether a denom is
 /// sendable).
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SendEnabled {
     #[prost(string, tag = "1")]
@@ -34,11 +36,13 @@ impl ::prost::Name for SendEnabled {
     const NAME: &'static str = "SendEnabled";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.SendEnabled".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.SendEnabled".into()
     }
 }
 /// Input models transaction input.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Input {
     #[prost(string, tag = "1")]
@@ -50,11 +54,13 @@ impl ::prost::Name for Input {
     const NAME: &'static str = "Input";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.Input".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.Input".into()
     }
 }
 /// Output models transaction outputs.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Output {
     #[prost(string, tag = "1")]
@@ -66,13 +72,15 @@ impl ::prost::Name for Output {
     const NAME: &'static str = "Output";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.Output".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.Output".into()
     }
 }
 /// Supply represents a struct that passively keeps track of the total supply
 /// amounts in the network.
 /// This message is deprecated now that supply is indexed by denom.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Supply {
     #[prost(message, repeated, tag = "1")]
@@ -82,12 +90,14 @@ impl ::prost::Name for Supply {
     const NAME: &'static str = "Supply";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.Supply".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.Supply".into()
     }
 }
 /// DenomUnit represents a struct that describes a given
 /// denomination unit of the basic token.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DenomUnit {
     /// denom represents the string name of the given denom unit (e.g uatom).
@@ -108,12 +118,14 @@ impl ::prost::Name for DenomUnit {
     const NAME: &'static str = "DenomUnit";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.DenomUnit".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.DenomUnit".into()
     }
 }
 /// Metadata represents a struct that describes
 /// a basic token.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Metadata {
     #[prost(string, tag = "1")]
@@ -155,11 +167,13 @@ impl ::prost::Name for Metadata {
     const NAME: &'static str = "Metadata";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.Metadata".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.Metadata".into()
     }
 }
 /// QueryBalanceRequest is the request type for the Query/Balance RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryBalanceRequest {
     /// address is the address to query balances for.
@@ -173,11 +187,13 @@ impl ::prost::Name for QueryBalanceRequest {
     const NAME: &'static str = "QueryBalanceRequest";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryBalanceRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryBalanceRequest".into()
     }
 }
 /// QueryBalanceResponse is the response type for the Query/Balance RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryBalanceResponse {
     /// balance is the balance of the coin.
@@ -188,11 +204,13 @@ impl ::prost::Name for QueryBalanceResponse {
     const NAME: &'static str = "QueryBalanceResponse";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryBalanceResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryBalanceResponse".into()
     }
 }
 /// QueryBalanceRequest is the request type for the Query/AllBalances RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryAllBalancesRequest {
     /// address is the address to query balances for.
@@ -213,12 +231,14 @@ impl ::prost::Name for QueryAllBalancesRequest {
     const NAME: &'static str = "QueryAllBalancesRequest";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryAllBalancesRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryAllBalancesRequest".into()
     }
 }
 /// QueryAllBalancesResponse is the response type for the Query/AllBalances RPC
 /// method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryAllBalancesResponse {
     /// balances is the balances of all the coins.
@@ -234,14 +254,16 @@ impl ::prost::Name for QueryAllBalancesResponse {
     const NAME: &'static str = "QueryAllBalancesResponse";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryAllBalancesResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryAllBalancesResponse".into()
     }
 }
 /// QuerySpendableBalancesRequest defines the gRPC request structure for querying
 /// an account's spendable balances.
 ///
 /// Since: cosmos-sdk 0.46
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QuerySpendableBalancesRequest {
     /// address is the address to query spendable balances for.
@@ -257,14 +279,16 @@ impl ::prost::Name for QuerySpendableBalancesRequest {
     const NAME: &'static str = "QuerySpendableBalancesRequest";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QuerySpendableBalancesRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QuerySpendableBalancesRequest".into()
     }
 }
 /// QuerySpendableBalancesResponse defines the gRPC response structure for querying
 /// an account's spendable balances.
 ///
 /// Since: cosmos-sdk 0.46
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QuerySpendableBalancesResponse {
     /// balances is the spendable balances of all the coins.
@@ -280,14 +304,16 @@ impl ::prost::Name for QuerySpendableBalancesResponse {
     const NAME: &'static str = "QuerySpendableBalancesResponse";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QuerySpendableBalancesResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QuerySpendableBalancesResponse".into()
     }
 }
 /// QuerySpendableBalanceByDenomRequest defines the gRPC request structure for
 /// querying an account's spendable balance for a specific denom.
 ///
 /// Since: cosmos-sdk 0.47
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QuerySpendableBalanceByDenomRequest {
     /// address is the address to query balances for.
@@ -301,14 +327,16 @@ impl ::prost::Name for QuerySpendableBalanceByDenomRequest {
     const NAME: &'static str = "QuerySpendableBalanceByDenomRequest";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QuerySpendableBalanceByDenomRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QuerySpendableBalanceByDenomRequest".into()
     }
 }
 /// QuerySpendableBalanceByDenomResponse defines the gRPC response structure for
 /// querying an account's spendable balance for a specific denom.
 ///
 /// Since: cosmos-sdk 0.47
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QuerySpendableBalanceByDenomResponse {
     /// balance is the balance of the coin.
@@ -319,12 +347,14 @@ impl ::prost::Name for QuerySpendableBalanceByDenomResponse {
     const NAME: &'static str = "QuerySpendableBalanceByDenomResponse";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QuerySpendableBalanceByDenomResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QuerySpendableBalanceByDenomResponse".into()
     }
 }
 /// QueryTotalSupplyRequest is the request type for the Query/TotalSupply RPC
 /// method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryTotalSupplyRequest {
     /// pagination defines an optional pagination for the request.
@@ -339,12 +369,14 @@ impl ::prost::Name for QueryTotalSupplyRequest {
     const NAME: &'static str = "QueryTotalSupplyRequest";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryTotalSupplyRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryTotalSupplyRequest".into()
     }
 }
 /// QueryTotalSupplyResponse is the response type for the Query/TotalSupply RPC
 /// method
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryTotalSupplyResponse {
     /// supply is the supply of the coins
@@ -362,11 +394,13 @@ impl ::prost::Name for QueryTotalSupplyResponse {
     const NAME: &'static str = "QueryTotalSupplyResponse";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryTotalSupplyResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryTotalSupplyResponse".into()
     }
 }
 /// QuerySupplyOfRequest is the request type for the Query/SupplyOf RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QuerySupplyOfRequest {
     /// denom is the coin denom to query balances for.
@@ -377,11 +411,13 @@ impl ::prost::Name for QuerySupplyOfRequest {
     const NAME: &'static str = "QuerySupplyOfRequest";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QuerySupplyOfRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QuerySupplyOfRequest".into()
     }
 }
 /// QuerySupplyOfResponse is the response type for the Query/SupplyOf RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QuerySupplyOfResponse {
     /// amount is the supply of the coin.
@@ -392,22 +428,26 @@ impl ::prost::Name for QuerySupplyOfResponse {
     const NAME: &'static str = "QuerySupplyOfResponse";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QuerySupplyOfResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QuerySupplyOfResponse".into()
     }
 }
 /// QueryParamsRequest defines the request type for querying x/bank parameters.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct QueryParamsRequest {}
 impl ::prost::Name for QueryParamsRequest {
     const NAME: &'static str = "QueryParamsRequest";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryParamsRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryParamsRequest".into()
     }
 }
 /// QueryParamsResponse defines the response type for querying x/bank parameters.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryParamsResponse {
     #[prost(message, optional, tag = "1")]
@@ -417,11 +457,13 @@ impl ::prost::Name for QueryParamsResponse {
     const NAME: &'static str = "QueryParamsResponse";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryParamsResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryParamsResponse".into()
     }
 }
 /// QueryDenomsMetadataRequest is the request type for the Query/DenomsMetadata RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryDenomsMetadataRequest {
     /// pagination defines an optional pagination for the request.
@@ -434,12 +476,14 @@ impl ::prost::Name for QueryDenomsMetadataRequest {
     const NAME: &'static str = "QueryDenomsMetadataRequest";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryDenomsMetadataRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryDenomsMetadataRequest".into()
     }
 }
 /// QueryDenomsMetadataResponse is the response type for the Query/DenomsMetadata RPC
 /// method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryDenomsMetadataResponse {
     /// metadata provides the client information for all the registered tokens.
@@ -455,11 +499,13 @@ impl ::prost::Name for QueryDenomsMetadataResponse {
     const NAME: &'static str = "QueryDenomsMetadataResponse";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryDenomsMetadataResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryDenomsMetadataResponse".into()
     }
 }
 /// QueryDenomMetadataRequest is the request type for the Query/DenomMetadata RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryDenomMetadataRequest {
     /// denom is the coin denom to query the metadata for.
@@ -470,12 +516,14 @@ impl ::prost::Name for QueryDenomMetadataRequest {
     const NAME: &'static str = "QueryDenomMetadataRequest";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryDenomMetadataRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryDenomMetadataRequest".into()
     }
 }
 /// QueryDenomMetadataResponse is the response type for the Query/DenomMetadata RPC
 /// method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryDenomMetadataResponse {
     /// metadata describes and provides all the client information for the requested token.
@@ -486,13 +534,15 @@ impl ::prost::Name for QueryDenomMetadataResponse {
     const NAME: &'static str = "QueryDenomMetadataResponse";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryDenomMetadataResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryDenomMetadataResponse".into()
     }
 }
 /// QueryDenomOwnersRequest defines the request type for the DenomOwners RPC query,
 /// which queries for a paginated set of all account holders of a particular
 /// denomination.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryDenomOwnersRequest {
     /// denom defines the coin denomination to query all account holders for.
@@ -508,7 +558,10 @@ impl ::prost::Name for QueryDenomOwnersRequest {
     const NAME: &'static str = "QueryDenomOwnersRequest";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryDenomOwnersRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryDenomOwnersRequest".into()
     }
 }
 /// DenomOwner defines structure representing an account that owns or holds a
@@ -516,7 +569,6 @@ impl ::prost::Name for QueryDenomOwnersRequest {
 /// balance of the denominated token.
 ///
 /// Since: cosmos-sdk 0.46
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DenomOwner {
     /// address defines the address that owns a particular denomination.
@@ -530,13 +582,15 @@ impl ::prost::Name for DenomOwner {
     const NAME: &'static str = "DenomOwner";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.DenomOwner".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.DenomOwner".into()
     }
 }
 /// QueryDenomOwnersResponse defines the RPC response of a DenomOwners RPC query.
 ///
 /// Since: cosmos-sdk 0.46
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryDenomOwnersResponse {
     #[prost(message, repeated, tag = "1")]
@@ -551,13 +605,15 @@ impl ::prost::Name for QueryDenomOwnersResponse {
     const NAME: &'static str = "QueryDenomOwnersResponse";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QueryDenomOwnersResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QueryDenomOwnersResponse".into()
     }
 }
 /// QuerySendEnabledRequest defines the RPC request for looking up SendEnabled entries.
 ///
 /// Since: cosmos-sdk 0.47
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QuerySendEnabledRequest {
     /// denoms is the specific denoms you want look up. Leave empty to get all entries.
@@ -574,13 +630,15 @@ impl ::prost::Name for QuerySendEnabledRequest {
     const NAME: &'static str = "QuerySendEnabledRequest";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QuerySendEnabledRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QuerySendEnabledRequest".into()
     }
 }
 /// QuerySendEnabledResponse defines the RPC response of a SendEnable query.
 ///
 /// Since: cosmos-sdk 0.47
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QuerySendEnabledResponse {
     #[prost(message, repeated, tag = "1")]
@@ -596,13 +654,22 @@ impl ::prost::Name for QuerySendEnabledResponse {
     const NAME: &'static str = "QuerySendEnabledResponse";
     const PACKAGE: &'static str = "cosmos.bank.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.bank.v1beta1.{}", Self::NAME)
+        "cosmos.bank.v1beta1.QuerySendEnabledResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.bank.v1beta1.QuerySendEnabledResponse".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query defines the gRPC querier service.
@@ -625,8 +692,8 @@ pub mod query_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -651,7 +718,7 @@ pub mod query_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -698,8 +765,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -727,8 +793,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -759,8 +824,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -793,8 +857,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -827,8 +890,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -856,8 +918,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -882,8 +943,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -908,8 +968,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -935,8 +994,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -967,8 +1025,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -999,8 +1056,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1018,11 +1074,17 @@ pub mod query_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServer.
     #[async_trait]
-    pub trait Query: Send + Sync + 'static {
+    pub trait Query: std::marker::Send + std::marker::Sync + 'static {
         /// Balance queries the balance of a single coin for a single account.
         async fn balance(
             &self,
@@ -1148,20 +1210,18 @@ pub mod query_server {
     }
     /// Query defines the gRPC querier service.
     #[derive(Debug)]
-    pub struct QueryServer<T: Query> {
-        inner: _Inner<T>,
+    pub struct QueryServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: Query> QueryServer<T> {
+    impl<T> QueryServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -1211,8 +1271,8 @@ pub mod query_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServer<T>
     where
         T: Query,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -1224,7 +1284,6 @@ pub mod query_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/cosmos.bank.v1beta1.Query/Balance" => {
                     #[allow(non_camel_case_types)]
@@ -1255,7 +1314,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = BalanceSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1301,7 +1359,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AllBalancesSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1347,7 +1404,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = SpendableBalancesSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1397,7 +1453,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = SpendableBalanceByDenomSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1443,7 +1498,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = TotalSupplySvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1489,7 +1543,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = SupplyOfSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1533,7 +1586,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ParamsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1579,7 +1631,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = DenomMetadataSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1625,7 +1676,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = DenomsMetadataSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1671,7 +1721,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = DenomOwnersSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1717,7 +1766,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = SendEnabledSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1736,20 +1784,25 @@ pub mod query_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: Query> Clone for QueryServer<T> {
+    impl<T> Clone for QueryServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -1761,17 +1814,9 @@ pub mod query_server {
             }
         }
     }
-    impl<T: Query> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: Query> tonic::server::NamedService for QueryServer<T> {
-        const NAME: &'static str = "cosmos.bank.v1beta1.Query";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "cosmos.bank.v1beta1.Query";
+    impl<T> tonic::server::NamedService for QueryServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/cosmos.base.abci.v1beta1.rs b/crates/proto/src/gen/cosmos.base.abci.v1beta1.rs
index 574a2519a4..e1c9e389dc 100644
--- a/crates/proto/src/gen/cosmos.base.abci.v1beta1.rs
+++ b/crates/proto/src/gen/cosmos.base.abci.v1beta1.rs
@@ -1,6 +1,6 @@
+// This file is @generated by prost-build.
 /// TxResponse defines a structure containing relevant tx data and metadata. The
 /// tags are stringified and the log is JSON decoded.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxResponse {
     /// The block height
@@ -57,11 +57,13 @@ impl ::prost::Name for TxResponse {
     const NAME: &'static str = "TxResponse";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.abci.v1beta1.{}", Self::NAME)
+        "cosmos.base.abci.v1beta1.TxResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.abci.v1beta1.TxResponse".into()
     }
 }
 /// ABCIMessageLog defines a structure containing an indexed tx ABCI message log.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AbciMessageLog {
     #[prost(uint32, tag = "1")]
@@ -77,12 +79,14 @@ impl ::prost::Name for AbciMessageLog {
     const NAME: &'static str = "ABCIMessageLog";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.abci.v1beta1.{}", Self::NAME)
+        "cosmos.base.abci.v1beta1.ABCIMessageLog".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.abci.v1beta1.ABCIMessageLog".into()
     }
 }
 /// StringEvent defines en Event object wrapper where all the attributes
 /// contain key/value pairs that are strings instead of raw bytes.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct StringEvent {
     #[prost(string, tag = "1")]
@@ -94,12 +98,14 @@ impl ::prost::Name for StringEvent {
     const NAME: &'static str = "StringEvent";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.abci.v1beta1.{}", Self::NAME)
+        "cosmos.base.abci.v1beta1.StringEvent".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.abci.v1beta1.StringEvent".into()
     }
 }
 /// Attribute defines an attribute wrapper where the key and value are
 /// strings instead of raw bytes.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Attribute {
     #[prost(string, tag = "1")]
@@ -111,12 +117,14 @@ impl ::prost::Name for Attribute {
     const NAME: &'static str = "Attribute";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.abci.v1beta1.{}", Self::NAME)
+        "cosmos.base.abci.v1beta1.Attribute".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.abci.v1beta1.Attribute".into()
     }
 }
 /// GasInfo defines tx execution gas context.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct GasInfo {
     /// GasWanted is the maximum units of work we allow this tx to perform.
     #[prost(uint64, tag = "1")]
@@ -129,11 +137,13 @@ impl ::prost::Name for GasInfo {
     const NAME: &'static str = "GasInfo";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.abci.v1beta1.{}", Self::NAME)
+        "cosmos.base.abci.v1beta1.GasInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.abci.v1beta1.GasInfo".into()
     }
 }
 /// Result is the union of ResponseFormat and ResponseCheckTx.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Result {
     /// Data is any data returned from message or handler execution. It MUST be
@@ -162,12 +172,14 @@ impl ::prost::Name for Result {
     const NAME: &'static str = "Result";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.abci.v1beta1.{}", Self::NAME)
+        "cosmos.base.abci.v1beta1.Result".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.abci.v1beta1.Result".into()
     }
 }
 /// SimulationResponse defines the response generated when a transaction is
 /// successfully simulated.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SimulationResponse {
     #[prost(message, optional, tag = "1")]
@@ -179,12 +191,14 @@ impl ::prost::Name for SimulationResponse {
     const NAME: &'static str = "SimulationResponse";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.abci.v1beta1.{}", Self::NAME)
+        "cosmos.base.abci.v1beta1.SimulationResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.abci.v1beta1.SimulationResponse".into()
     }
 }
 /// MsgData defines the data returned in a Result object during message
 /// execution.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MsgData {
     #[prost(string, tag = "1")]
@@ -196,12 +210,14 @@ impl ::prost::Name for MsgData {
     const NAME: &'static str = "MsgData";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.abci.v1beta1.{}", Self::NAME)
+        "cosmos.base.abci.v1beta1.MsgData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.abci.v1beta1.MsgData".into()
     }
 }
 /// TxMsgData defines a list of MsgData. A transaction will have a MsgData object
 /// for each message.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxMsgData {
     /// data field is deprecated and not populated.
@@ -218,11 +234,13 @@ impl ::prost::Name for TxMsgData {
     const NAME: &'static str = "TxMsgData";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.abci.v1beta1.{}", Self::NAME)
+        "cosmos.base.abci.v1beta1.TxMsgData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.abci.v1beta1.TxMsgData".into()
     }
 }
 /// SearchTxsResult defines a structure for querying txs pageable
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SearchTxsResult {
     /// Count of all txs
@@ -248,11 +266,13 @@ impl ::prost::Name for SearchTxsResult {
     const NAME: &'static str = "SearchTxsResult";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.abci.v1beta1.{}", Self::NAME)
+        "cosmos.base.abci.v1beta1.SearchTxsResult".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.abci.v1beta1.SearchTxsResult".into()
     }
 }
 /// SearchBlocksResult defines a structure for querying blocks pageable
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SearchBlocksResult {
     /// Count of all blocks
@@ -280,6 +300,9 @@ impl ::prost::Name for SearchBlocksResult {
     const NAME: &'static str = "SearchBlocksResult";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.abci.v1beta1.{}", Self::NAME)
+        "cosmos.base.abci.v1beta1.SearchBlocksResult".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.abci.v1beta1.SearchBlocksResult".into()
     }
 }
diff --git a/crates/proto/src/gen/cosmos.base.query.v1beta1.rs b/crates/proto/src/gen/cosmos.base.query.v1beta1.rs
index f25dadc86c..c973de722f 100644
--- a/crates/proto/src/gen/cosmos.base.query.v1beta1.rs
+++ b/crates/proto/src/gen/cosmos.base.query.v1beta1.rs
@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// PageRequest is to be embedded in gRPC request messages for efficient
 /// pagination. Ex:
 ///
@@ -5,7 +6,6 @@
 /// Foo some_parameter = 1;
 /// PageRequest pagination = 2;
 /// }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PageRequest {
     /// key is a value returned in PageResponse.next_key to begin
@@ -38,7 +38,10 @@ impl ::prost::Name for PageRequest {
     const NAME: &'static str = "PageRequest";
     const PACKAGE: &'static str = "cosmos.base.query.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.query.v1beta1.{}", Self::NAME)
+        "cosmos.base.query.v1beta1.PageRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.query.v1beta1.PageRequest".into()
     }
 }
 /// PageResponse is to be embedded in gRPC response messages where the
@@ -48,7 +51,6 @@ impl ::prost::Name for PageRequest {
 /// repeated Bar results = 1;
 /// PageResponse page = 2;
 /// }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PageResponse {
     /// next_key is the key to be passed to PageRequest.key to
@@ -65,6 +67,9 @@ impl ::prost::Name for PageResponse {
     const NAME: &'static str = "PageResponse";
     const PACKAGE: &'static str = "cosmos.base.query.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.query.v1beta1.{}", Self::NAME)
+        "cosmos.base.query.v1beta1.PageResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.query.v1beta1.PageResponse".into()
     }
 }
diff --git a/crates/proto/src/gen/cosmos.base.v1beta1.rs b/crates/proto/src/gen/cosmos.base.v1beta1.rs
index a24098b3ee..67b93478c9 100644
--- a/crates/proto/src/gen/cosmos.base.v1beta1.rs
+++ b/crates/proto/src/gen/cosmos.base.v1beta1.rs
@@ -1,8 +1,8 @@
+// This file is @generated by prost-build.
 /// Coin defines a token with a denomination and an amount.
 ///
 /// NOTE: The amount field is an Int which implements the custom method
 /// signatures required by gogoproto.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Coin {
     #[prost(string, tag = "1")]
@@ -14,14 +14,16 @@ impl ::prost::Name for Coin {
     const NAME: &'static str = "Coin";
     const PACKAGE: &'static str = "cosmos.base.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.v1beta1.{}", Self::NAME)
+        "cosmos.base.v1beta1.Coin".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.v1beta1.Coin".into()
     }
 }
 /// DecCoin defines a token with a denomination and a decimal amount.
 ///
 /// NOTE: The amount field is an Dec which implements the custom method
 /// signatures required by gogoproto.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DecCoin {
     #[prost(string, tag = "1")]
@@ -33,6 +35,9 @@ impl ::prost::Name for DecCoin {
     const NAME: &'static str = "DecCoin";
     const PACKAGE: &'static str = "cosmos.base.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.base.v1beta1.{}", Self::NAME)
+        "cosmos.base.v1beta1.DecCoin".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.base.v1beta1.DecCoin".into()
     }
 }
diff --git a/crates/proto/src/gen/cosmos.crypto.multisig.v1beta1.rs b/crates/proto/src/gen/cosmos.crypto.multisig.v1beta1.rs
index 1d784f6978..26d4ac43e8 100644
--- a/crates/proto/src/gen/cosmos.crypto.multisig.v1beta1.rs
+++ b/crates/proto/src/gen/cosmos.crypto.multisig.v1beta1.rs
@@ -1,7 +1,7 @@
+// This file is @generated by prost-build.
 /// MultiSignature wraps the signatures from a multisig.LegacyAminoPubKey.
 /// See cosmos.tx.v1betata1.ModeInfo.Multi for how to specify which signers
 /// signed and with which modes.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MultiSignature {
     #[prost(bytes = "vec", repeated, tag = "1")]
@@ -11,14 +11,16 @@ impl ::prost::Name for MultiSignature {
     const NAME: &'static str = "MultiSignature";
     const PACKAGE: &'static str = "cosmos.crypto.multisig.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.crypto.multisig.v1beta1.{}", Self::NAME)
+        "cosmos.crypto.multisig.v1beta1.MultiSignature".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.crypto.multisig.v1beta1.MultiSignature".into()
     }
 }
 /// CompactBitArray is an implementation of a space efficient bit array.
 /// This is used to ensure that the encoded data takes up a minimal amount of
 /// space after proto encoding.
 /// This is not thread safe, and is not intended for concurrent usage.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CompactBitArray {
     #[prost(uint32, tag = "1")]
@@ -30,6 +32,9 @@ impl ::prost::Name for CompactBitArray {
     const NAME: &'static str = "CompactBitArray";
     const PACKAGE: &'static str = "cosmos.crypto.multisig.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.crypto.multisig.v1beta1.{}", Self::NAME)
+        "cosmos.crypto.multisig.v1beta1.CompactBitArray".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.crypto.multisig.v1beta1.CompactBitArray".into()
     }
 }
diff --git a/crates/proto/src/gen/cosmos.tx.config.v1.rs b/crates/proto/src/gen/cosmos.tx.config.v1.rs
index b79ab2e0fd..31586d462d 100644
--- a/crates/proto/src/gen/cosmos.tx.config.v1.rs
+++ b/crates/proto/src/gen/cosmos.tx.config.v1.rs
@@ -1,6 +1,6 @@
+// This file is @generated by prost-build.
 /// Config is the config object of the x/auth/tx package.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct Config {
     /// skip_ante_handler defines whether the ante handler registration should be skipped in case an app wants to override
     /// this functionality.
@@ -15,6 +15,9 @@ impl ::prost::Name for Config {
     const NAME: &'static str = "Config";
     const PACKAGE: &'static str = "cosmos.tx.config.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.config.v1.{}", Self::NAME)
+        "cosmos.tx.config.v1.Config".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.config.v1.Config".into()
     }
 }
diff --git a/crates/proto/src/gen/cosmos.tx.signing.v1beta1.rs b/crates/proto/src/gen/cosmos.tx.signing.v1beta1.rs
index c5b8f2f52f..25c93fb9de 100644
--- a/crates/proto/src/gen/cosmos.tx.signing.v1beta1.rs
+++ b/crates/proto/src/gen/cosmos.tx.signing.v1beta1.rs
@@ -1,5 +1,5 @@
+// This file is @generated by prost-build.
 /// SignatureDescriptors wraps multiple SignatureDescriptor's.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SignatureDescriptors {
     /// signatures are the signature descriptors
@@ -10,14 +10,16 @@ impl ::prost::Name for SignatureDescriptors {
     const NAME: &'static str = "SignatureDescriptors";
     const PACKAGE: &'static str = "cosmos.tx.signing.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.signing.v1beta1.{}", Self::NAME)
+        "cosmos.tx.signing.v1beta1.SignatureDescriptors".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.signing.v1beta1.SignatureDescriptors".into()
     }
 }
 /// SignatureDescriptor is a convenience type which represents the full data for
 /// a signature including the public key of the signer, signing modes and the
 /// signature itself. It is primarily used for coordinating signatures between
 /// clients.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SignatureDescriptor {
     /// public_key is the public key of the signer
@@ -34,7 +36,6 @@ pub struct SignatureDescriptor {
 /// Nested message and enum types in `SignatureDescriptor`.
 pub mod signature_descriptor {
     /// Data represents signature data
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Data {
         /// sum is the oneof that specifies whether this represents single or multi-signature data
@@ -44,7 +45,6 @@ pub mod signature_descriptor {
     /// Nested message and enum types in `Data`.
     pub mod data {
         /// Single is the signature data for a single signer
-        #[allow(clippy::derive_partial_eq_without_eq)]
         #[derive(Clone, PartialEq, ::prost::Message)]
         pub struct Single {
             /// mode is the signing mode of the single signer
@@ -58,13 +58,13 @@ pub mod signature_descriptor {
             const NAME: &'static str = "Single";
             const PACKAGE: &'static str = "cosmos.tx.signing.v1beta1";
             fn full_name() -> ::prost::alloc::string::String {
-                ::prost::alloc::format!(
-                    "cosmos.tx.signing.v1beta1.SignatureDescriptor.Data.{}", Self::NAME
-                )
+                "cosmos.tx.signing.v1beta1.SignatureDescriptor.Data.Single".into()
+            }
+            fn type_url() -> ::prost::alloc::string::String {
+                "/cosmos.tx.signing.v1beta1.SignatureDescriptor.Data.Single".into()
             }
         }
         /// Multi is the signature data for a multisig public key
-        #[allow(clippy::derive_partial_eq_without_eq)]
         #[derive(Clone, PartialEq, ::prost::Message)]
         pub struct Multi {
             /// bitarray specifies which keys within the multisig are signing
@@ -80,13 +80,13 @@ pub mod signature_descriptor {
             const NAME: &'static str = "Multi";
             const PACKAGE: &'static str = "cosmos.tx.signing.v1beta1";
             fn full_name() -> ::prost::alloc::string::String {
-                ::prost::alloc::format!(
-                    "cosmos.tx.signing.v1beta1.SignatureDescriptor.Data.{}", Self::NAME
-                )
+                "cosmos.tx.signing.v1beta1.SignatureDescriptor.Data.Multi".into()
+            }
+            fn type_url() -> ::prost::alloc::string::String {
+                "/cosmos.tx.signing.v1beta1.SignatureDescriptor.Data.Multi".into()
             }
         }
         /// sum is the oneof that specifies whether this represents single or multi-signature data
-        #[allow(clippy::derive_partial_eq_without_eq)]
         #[derive(Clone, PartialEq, ::prost::Oneof)]
         pub enum Sum {
             /// single represents a single signer
@@ -101,9 +101,10 @@ pub mod signature_descriptor {
         const NAME: &'static str = "Data";
         const PACKAGE: &'static str = "cosmos.tx.signing.v1beta1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "cosmos.tx.signing.v1beta1.SignatureDescriptor.{}", Self::NAME
-            )
+            "cosmos.tx.signing.v1beta1.SignatureDescriptor.Data".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/cosmos.tx.signing.v1beta1.SignatureDescriptor.Data".into()
         }
     }
 }
@@ -111,7 +112,10 @@ impl ::prost::Name for SignatureDescriptor {
     const NAME: &'static str = "SignatureDescriptor";
     const PACKAGE: &'static str = "cosmos.tx.signing.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.signing.v1beta1.{}", Self::NAME)
+        "cosmos.tx.signing.v1beta1.SignatureDescriptor".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.signing.v1beta1.SignatureDescriptor".into()
     }
 }
 /// SignMode represents a signing mode with its own security guarantees.
@@ -166,12 +170,12 @@ impl SignMode {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            SignMode::Unspecified => "SIGN_MODE_UNSPECIFIED",
-            SignMode::Direct => "SIGN_MODE_DIRECT",
-            SignMode::Textual => "SIGN_MODE_TEXTUAL",
-            SignMode::DirectAux => "SIGN_MODE_DIRECT_AUX",
-            SignMode::LegacyAminoJson => "SIGN_MODE_LEGACY_AMINO_JSON",
-            SignMode::Eip191 => "SIGN_MODE_EIP_191",
+            Self::Unspecified => "SIGN_MODE_UNSPECIFIED",
+            Self::Direct => "SIGN_MODE_DIRECT",
+            Self::Textual => "SIGN_MODE_TEXTUAL",
+            Self::DirectAux => "SIGN_MODE_DIRECT_AUX",
+            Self::LegacyAminoJson => "SIGN_MODE_LEGACY_AMINO_JSON",
+            Self::Eip191 => "SIGN_MODE_EIP_191",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
diff --git a/crates/proto/src/gen/cosmos.tx.v1beta1.rs b/crates/proto/src/gen/cosmos.tx.v1beta1.rs
index 8aeb187cda..0db9732ef4 100644
--- a/crates/proto/src/gen/cosmos.tx.v1beta1.rs
+++ b/crates/proto/src/gen/cosmos.tx.v1beta1.rs
@@ -1,5 +1,5 @@
+// This file is @generated by prost-build.
 /// Tx is the standard type used for broadcasting transactions.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Tx {
     /// body is the processable content of the transaction
@@ -19,7 +19,10 @@ impl ::prost::Name for Tx {
     const NAME: &'static str = "Tx";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.Tx".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.Tx".into()
     }
 }
 /// TxRaw is a variant of Tx that pins the signer's exact binary representation
@@ -27,7 +30,6 @@ impl ::prost::Name for Tx {
 /// verification. The binary `serialize(tx: TxRaw)` is stored in Tendermint and
 /// the hash `sha256(serialize(tx: TxRaw))` becomes the "txhash", commonly used
 /// as the transaction ID.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxRaw {
     /// body_bytes is a protobuf serialization of a TxBody that matches the
@@ -48,11 +50,13 @@ impl ::prost::Name for TxRaw {
     const NAME: &'static str = "TxRaw";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.TxRaw".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.TxRaw".into()
     }
 }
 /// SignDoc is the type used for generating sign bytes for SIGN_MODE_DIRECT.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SignDoc {
     /// body_bytes is protobuf serialization of a TxBody that matches the
@@ -76,14 +80,16 @@ impl ::prost::Name for SignDoc {
     const NAME: &'static str = "SignDoc";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.SignDoc".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.SignDoc".into()
     }
 }
 /// SignDocDirectAux is the type used for generating sign bytes for
 /// SIGN_MODE_DIRECT_AUX.
 ///
 /// Since: cosmos-sdk 0.46
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SignDocDirectAux {
     /// body_bytes is protobuf serialization of a TxBody that matches the
@@ -117,11 +123,13 @@ impl ::prost::Name for SignDocDirectAux {
     const NAME: &'static str = "SignDocDirectAux";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.SignDocDirectAux".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.SignDocDirectAux".into()
     }
 }
 /// TxBody is the body of a transaction that all signers sign over.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxBody {
     /// messages is a list of messages to be executed. The required signers of
@@ -157,12 +165,14 @@ impl ::prost::Name for TxBody {
     const NAME: &'static str = "TxBody";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.TxBody".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.TxBody".into()
     }
 }
 /// AuthInfo describes the fee and signer modes that are used to sign a
 /// transaction.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuthInfo {
     /// signer_infos defines the signing modes for the required signers. The number
@@ -190,12 +200,14 @@ impl ::prost::Name for AuthInfo {
     const NAME: &'static str = "AuthInfo";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.AuthInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.AuthInfo".into()
     }
 }
 /// SignerInfo describes the public key and signing mode of a single top-level
 /// signer.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SignerInfo {
     /// public_key is the public key of the signer. It is optional for accounts
@@ -217,11 +229,13 @@ impl ::prost::Name for SignerInfo {
     const NAME: &'static str = "SignerInfo";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.SignerInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.SignerInfo".into()
     }
 }
 /// ModeInfo describes the signing mode of a single or nested multisig signer.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ModeInfo {
     /// sum is the oneof that specifies whether this represents a single or nested
@@ -234,8 +248,7 @@ pub mod mode_info {
     /// Single is the mode info for a single signer. It is structured as a message
     /// to allow for additional fields such as locale for SIGN_MODE_TEXTUAL in the
     /// future
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct Single {
         /// mode is the signing mode of the single signer
         #[prost(enumeration = "super::super::signing::v1beta1::SignMode", tag = "1")]
@@ -245,11 +258,13 @@ pub mod mode_info {
         const NAME: &'static str = "Single";
         const PACKAGE: &'static str = "cosmos.tx.v1beta1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!("cosmos.tx.v1beta1.ModeInfo.{}", Self::NAME)
+            "cosmos.tx.v1beta1.ModeInfo.Single".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/cosmos.tx.v1beta1.ModeInfo.Single".into()
         }
     }
     /// Multi is the mode info for a multisig public key
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Multi {
         /// bitarray specifies which keys within the multisig are signing
@@ -266,12 +281,14 @@ pub mod mode_info {
         const NAME: &'static str = "Multi";
         const PACKAGE: &'static str = "cosmos.tx.v1beta1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!("cosmos.tx.v1beta1.ModeInfo.{}", Self::NAME)
+            "cosmos.tx.v1beta1.ModeInfo.Multi".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/cosmos.tx.v1beta1.ModeInfo.Multi".into()
         }
     }
     /// sum is the oneof that specifies whether this represents a single or nested
     /// multisig signer
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Sum {
         /// single represents a single signer
@@ -286,13 +303,15 @@ impl ::prost::Name for ModeInfo {
     const NAME: &'static str = "ModeInfo";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.ModeInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.ModeInfo".into()
     }
 }
 /// Fee includes the amount of coins paid in fees and the maximum
 /// gas to be used by the transaction. The ratio yields an effective "gasprice",
 /// which must be above some miminum to be accepted into the mempool.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Fee {
     /// amount is the amount of coins to be paid as a fee
@@ -317,13 +336,15 @@ impl ::prost::Name for Fee {
     const NAME: &'static str = "Fee";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.Fee".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.Fee".into()
     }
 }
 /// Tip is the tip used for meta-transactions.
 ///
 /// Since: cosmos-sdk 0.46
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Tip {
     /// amount is the amount of the tip
@@ -337,7 +358,10 @@ impl ::prost::Name for Tip {
     const NAME: &'static str = "Tip";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.Tip".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.Tip".into()
     }
 }
 /// AuxSignerData is the intermediary format that an auxiliary signer (e.g. a
@@ -346,7 +370,6 @@ impl ::prost::Name for Tip {
 /// by the node if sent directly as-is.
 ///
 /// Since: cosmos-sdk 0.46
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuxSignerData {
     /// address is the bech32-encoded address of the auxiliary signer. If using
@@ -370,12 +393,14 @@ impl ::prost::Name for AuxSignerData {
     const NAME: &'static str = "AuxSignerData";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.AuxSignerData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.AuxSignerData".into()
     }
 }
 /// GetTxsEventRequest is the request type for the Service.TxsByEvents
 /// RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetTxsEventRequest {
     /// events is the list of transaction event type.
@@ -412,12 +437,14 @@ impl ::prost::Name for GetTxsEventRequest {
     const NAME: &'static str = "GetTxsEventRequest";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.GetTxsEventRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.GetTxsEventRequest".into()
     }
 }
 /// GetTxsEventResponse is the response type for the Service.TxsByEvents
 /// RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetTxsEventResponse {
     /// txs is the list of queried transactions.
@@ -443,12 +470,14 @@ impl ::prost::Name for GetTxsEventResponse {
     const NAME: &'static str = "GetTxsEventResponse";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.GetTxsEventResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.GetTxsEventResponse".into()
     }
 }
 /// BroadcastTxRequest is the request type for the Service.BroadcastTxRequest
 /// RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BroadcastTxRequest {
     /// tx_bytes is the raw transaction.
@@ -461,12 +490,14 @@ impl ::prost::Name for BroadcastTxRequest {
     const NAME: &'static str = "BroadcastTxRequest";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.BroadcastTxRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.BroadcastTxRequest".into()
     }
 }
 /// BroadcastTxResponse is the response type for the
 /// Service.BroadcastTx method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BroadcastTxResponse {
     /// tx_response is the queried TxResponses.
@@ -479,12 +510,14 @@ impl ::prost::Name for BroadcastTxResponse {
     const NAME: &'static str = "BroadcastTxResponse";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.BroadcastTxResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.BroadcastTxResponse".into()
     }
 }
 /// SimulateRequest is the request type for the Service.Simulate
 /// RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SimulateRequest {
     /// tx is the transaction to simulate.
@@ -502,12 +535,14 @@ impl ::prost::Name for SimulateRequest {
     const NAME: &'static str = "SimulateRequest";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.SimulateRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.SimulateRequest".into()
     }
 }
 /// SimulateResponse is the response type for the
 /// Service.SimulateRPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SimulateResponse {
     /// gas_info is the information about gas used in the simulation.
@@ -521,12 +556,14 @@ impl ::prost::Name for SimulateResponse {
     const NAME: &'static str = "SimulateResponse";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.SimulateResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.SimulateResponse".into()
     }
 }
 /// GetTxRequest is the request type for the Service.GetTx
 /// RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetTxRequest {
     /// hash is the tx hash to query, encoded as a hex string.
@@ -537,11 +574,13 @@ impl ::prost::Name for GetTxRequest {
     const NAME: &'static str = "GetTxRequest";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.GetTxRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.GetTxRequest".into()
     }
 }
 /// GetTxResponse is the response type for the Service.GetTx method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetTxResponse {
     /// tx is the queried transaction.
@@ -557,14 +596,16 @@ impl ::prost::Name for GetTxResponse {
     const NAME: &'static str = "GetTxResponse";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.GetTxResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.GetTxResponse".into()
     }
 }
 /// GetBlockWithTxsRequest is the request type for the Service.GetBlockWithTxs
 /// RPC method.
 ///
 /// Since: cosmos-sdk 0.45.2
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetBlockWithTxsRequest {
     /// height is the height of the block to query.
@@ -580,14 +621,16 @@ impl ::prost::Name for GetBlockWithTxsRequest {
     const NAME: &'static str = "GetBlockWithTxsRequest";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.GetBlockWithTxsRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.GetBlockWithTxsRequest".into()
     }
 }
 /// GetBlockWithTxsResponse is the response type for the Service.GetBlockWithTxs
 /// method.
 ///
 /// Since: cosmos-sdk 0.45.2
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetBlockWithTxsResponse {
     /// txs are the transactions in the block.
@@ -609,14 +652,16 @@ impl ::prost::Name for GetBlockWithTxsResponse {
     const NAME: &'static str = "GetBlockWithTxsResponse";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.GetBlockWithTxsResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.GetBlockWithTxsResponse".into()
     }
 }
 /// TxDecodeRequest is the request type for the Service.TxDecode
 /// RPC method.
 ///
 /// Since: cosmos-sdk 0.47
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxDecodeRequest {
     /// tx_bytes is the raw transaction.
@@ -627,14 +672,16 @@ impl ::prost::Name for TxDecodeRequest {
     const NAME: &'static str = "TxDecodeRequest";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.TxDecodeRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.TxDecodeRequest".into()
     }
 }
 /// TxDecodeResponse is the response type for the
 /// Service.TxDecode method.
 ///
 /// Since: cosmos-sdk 0.47
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxDecodeResponse {
     /// tx is the decoded transaction.
@@ -645,14 +692,16 @@ impl ::prost::Name for TxDecodeResponse {
     const NAME: &'static str = "TxDecodeResponse";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.TxDecodeResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.TxDecodeResponse".into()
     }
 }
 /// TxEncodeRequest is the request type for the Service.TxEncode
 /// RPC method.
 ///
 /// Since: cosmos-sdk 0.47
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxEncodeRequest {
     /// tx is the transaction to encode.
@@ -663,14 +712,16 @@ impl ::prost::Name for TxEncodeRequest {
     const NAME: &'static str = "TxEncodeRequest";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.TxEncodeRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.TxEncodeRequest".into()
     }
 }
 /// TxEncodeResponse is the response type for the
 /// Service.TxEncode method.
 ///
 /// Since: cosmos-sdk 0.47
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxEncodeResponse {
     /// tx_bytes is the encoded transaction bytes.
@@ -681,14 +732,16 @@ impl ::prost::Name for TxEncodeResponse {
     const NAME: &'static str = "TxEncodeResponse";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.TxEncodeResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.TxEncodeResponse".into()
     }
 }
 /// TxEncodeAminoRequest is the request type for the Service.TxEncodeAmino
 /// RPC method.
 ///
 /// Since: cosmos-sdk 0.47
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxEncodeAminoRequest {
     #[prost(string, tag = "1")]
@@ -698,14 +751,16 @@ impl ::prost::Name for TxEncodeAminoRequest {
     const NAME: &'static str = "TxEncodeAminoRequest";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.TxEncodeAminoRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.TxEncodeAminoRequest".into()
     }
 }
 /// TxEncodeAminoResponse is the response type for the Service.TxEncodeAmino
 /// RPC method.
 ///
 /// Since: cosmos-sdk 0.47
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxEncodeAminoResponse {
     #[prost(bytes = "vec", tag = "1")]
@@ -715,14 +770,16 @@ impl ::prost::Name for TxEncodeAminoResponse {
     const NAME: &'static str = "TxEncodeAminoResponse";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.TxEncodeAminoResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.TxEncodeAminoResponse".into()
     }
 }
 /// TxDecodeAminoRequest is the request type for the Service.TxDecodeAmino
 /// RPC method.
 ///
 /// Since: cosmos-sdk 0.47
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxDecodeAminoRequest {
     #[prost(bytes = "vec", tag = "1")]
@@ -732,14 +789,16 @@ impl ::prost::Name for TxDecodeAminoRequest {
     const NAME: &'static str = "TxDecodeAminoRequest";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.TxDecodeAminoRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.TxDecodeAminoRequest".into()
     }
 }
 /// TxDecodeAminoResponse is the response type for the Service.TxDecodeAmino
 /// RPC method.
 ///
 /// Since: cosmos-sdk 0.47
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxDecodeAminoResponse {
     #[prost(string, tag = "1")]
@@ -749,7 +808,10 @@ impl ::prost::Name for TxDecodeAminoResponse {
     const NAME: &'static str = "TxDecodeAminoResponse";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos.tx.v1beta1.{}", Self::NAME)
+        "cosmos.tx.v1beta1.TxDecodeAminoResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos.tx.v1beta1.TxDecodeAminoResponse".into()
     }
 }
 /// OrderBy defines the sorting order
@@ -771,9 +833,9 @@ impl OrderBy {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            OrderBy::Unspecified => "ORDER_BY_UNSPECIFIED",
-            OrderBy::Asc => "ORDER_BY_ASC",
-            OrderBy::Desc => "ORDER_BY_DESC",
+            Self::Unspecified => "ORDER_BY_UNSPECIFIED",
+            Self::Asc => "ORDER_BY_ASC",
+            Self::Desc => "ORDER_BY_DESC",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -810,10 +872,10 @@ impl BroadcastMode {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            BroadcastMode::Unspecified => "BROADCAST_MODE_UNSPECIFIED",
-            BroadcastMode::Block => "BROADCAST_MODE_BLOCK",
-            BroadcastMode::Sync => "BROADCAST_MODE_SYNC",
-            BroadcastMode::Async => "BROADCAST_MODE_ASYNC",
+            Self::Unspecified => "BROADCAST_MODE_UNSPECIFIED",
+            Self::Block => "BROADCAST_MODE_BLOCK",
+            Self::Sync => "BROADCAST_MODE_SYNC",
+            Self::Async => "BROADCAST_MODE_ASYNC",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -830,7 +892,13 @@ impl BroadcastMode {
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Service defines a gRPC service for interacting with transactions.
@@ -853,8 +921,8 @@ pub mod service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -879,7 +947,7 @@ pub mod service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             ServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -926,8 +994,7 @@ pub mod service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -949,8 +1016,7 @@ pub mod service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -975,8 +1041,7 @@ pub mod service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1001,8 +1066,7 @@ pub mod service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1029,8 +1093,7 @@ pub mod service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1057,8 +1120,7 @@ pub mod service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1085,8 +1147,7 @@ pub mod service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1113,8 +1174,7 @@ pub mod service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1141,8 +1201,7 @@ pub mod service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1160,11 +1219,17 @@ pub mod service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with ServiceServer.
     #[async_trait]
-    pub trait Service: Send + Sync + 'static {
+    pub trait Service: std::marker::Send + std::marker::Sync + 'static {
         /// Simulate simulates executing a transaction for estimating gas usage.
         async fn simulate(
             &self,
@@ -1247,20 +1312,18 @@ pub mod service_server {
     }
     /// Service defines a gRPC service for interacting with transactions.
     #[derive(Debug)]
-    pub struct ServiceServer<T: Service> {
-        inner: _Inner<T>,
+    pub struct ServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: Service> ServiceServer<T> {
+    impl<T> ServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -1310,8 +1373,8 @@ pub mod service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for ServiceServer<T>
     where
         T: Service,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -1323,7 +1386,6 @@ pub mod service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/cosmos.tx.v1beta1.Service/Simulate" => {
                     #[allow(non_camel_case_types)]
@@ -1352,7 +1414,6 @@ pub mod service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = SimulateSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1396,7 +1457,6 @@ pub mod service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = GetTxSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1442,7 +1502,6 @@ pub mod service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = BroadcastTxSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1488,7 +1547,6 @@ pub mod service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = GetTxsEventSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1534,7 +1592,6 @@ pub mod service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = GetBlockWithTxsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1578,7 +1635,6 @@ pub mod service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = TxDecodeSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1622,7 +1678,6 @@ pub mod service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = TxEncodeSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1668,7 +1723,6 @@ pub mod service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = TxEncodeAminoSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1714,7 +1768,6 @@ pub mod service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = TxDecodeAminoSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1733,20 +1786,25 @@ pub mod service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: Service> Clone for ServiceServer<T> {
+    impl<T> Clone for ServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -1758,17 +1816,9 @@ pub mod service_server {
             }
         }
     }
-    impl<T: Service> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: Service> tonic::server::NamedService for ServiceServer<T> {
-        const NAME: &'static str = "cosmos.tx.v1beta1.Service";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "cosmos.tx.v1beta1.Service";
+    impl<T> tonic::server::NamedService for ServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/cosmos_proto.rs b/crates/proto/src/gen/cosmos_proto.rs
index 053c6d5266..9057ec92dd 100644
--- a/crates/proto/src/gen/cosmos_proto.rs
+++ b/crates/proto/src/gen/cosmos_proto.rs
@@ -1,6 +1,6 @@
+// This file is @generated by prost-build.
 /// InterfaceDescriptor describes an interface type to be used with
 /// accepts_interface and implements_interface and declared by declare_interface.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct InterfaceDescriptor {
     /// name is the name of the interface. It should be a short-name (without
@@ -18,7 +18,10 @@ impl ::prost::Name for InterfaceDescriptor {
     const NAME: &'static str = "InterfaceDescriptor";
     const PACKAGE: &'static str = "cosmos_proto";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos_proto.{}", Self::NAME)
+        "cosmos_proto.InterfaceDescriptor".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos_proto.InterfaceDescriptor".into()
     }
 }
 /// ScalarDescriptor describes an scalar type to be used with
@@ -28,7 +31,6 @@ impl ::prost::Name for InterfaceDescriptor {
 /// Scalars should ideally define an encoding such that there is only one
 /// valid syntactical representation for a given semantic meaning,
 /// i.e. the encoding should be deterministic.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ScalarDescriptor {
     /// name is the name of the scalar. It should be a short-name (without
@@ -53,7 +55,10 @@ impl ::prost::Name for ScalarDescriptor {
     const NAME: &'static str = "ScalarDescriptor";
     const PACKAGE: &'static str = "cosmos_proto";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("cosmos_proto.{}", Self::NAME)
+        "cosmos_proto.ScalarDescriptor".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/cosmos_proto.ScalarDescriptor".into()
     }
 }
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
@@ -70,9 +75,9 @@ impl ScalarType {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            ScalarType::Unspecified => "SCALAR_TYPE_UNSPECIFIED",
-            ScalarType::String => "SCALAR_TYPE_STRING",
-            ScalarType::Bytes => "SCALAR_TYPE_BYTES",
+            Self::Unspecified => "SCALAR_TYPE_UNSPECIFIED",
+            Self::String => "SCALAR_TYPE_STRING",
+            Self::Bytes => "SCALAR_TYPE_BYTES",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
diff --git a/crates/proto/src/gen/google.api.rs b/crates/proto/src/gen/google.api.rs
index 6655a2b5d5..04c0f1fcf1 100644
--- a/crates/proto/src/gen/google.api.rs
+++ b/crates/proto/src/gen/google.api.rs
@@ -1,7 +1,7 @@
+// This file is @generated by prost-build.
 /// Defines the HTTP configuration for an API service. It contains a list of
 /// \[HttpRule\]\[google.api.HttpRule\], each specifying the mapping of an RPC method
 /// to one or more HTTP REST API methods.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Http {
     /// A list of HTTP configuration rules that apply to individual API methods.
@@ -22,7 +22,10 @@ impl ::prost::Name for Http {
     const NAME: &'static str = "Http";
     const PACKAGE: &'static str = "google.api";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("google.api.{}", Self::NAME)
+        "google.api.Http".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/google.api.Http".into()
     }
 }
 /// # gRPC Transcoding
@@ -307,7 +310,6 @@ impl ::prost::Name for Http {
 /// If an API needs to use a JSON array for request or response body, it can map
 /// the request or response body to a repeated field. However, some gRPC
 /// Transcoding implementations may not support this feature.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct HttpRule {
     /// Selects a method to which this rule applies.
@@ -347,7 +349,6 @@ pub mod http_rule {
     /// Determines the URL pattern is matched by this rules. This pattern can be
     /// used with any of the {get|put|post|delete|patch} methods. A custom method
     /// can be defined using the 'custom' field.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Pattern {
         /// Maps to HTTP GET. Used for listing and getting information about
@@ -378,11 +379,13 @@ impl ::prost::Name for HttpRule {
     const NAME: &'static str = "HttpRule";
     const PACKAGE: &'static str = "google.api";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("google.api.{}", Self::NAME)
+        "google.api.HttpRule".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/google.api.HttpRule".into()
     }
 }
 /// A custom pattern is used for defining custom HTTP verb.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CustomHttpPattern {
     /// The name of this custom HTTP verb.
@@ -396,6 +399,9 @@ impl ::prost::Name for CustomHttpPattern {
     const NAME: &'static str = "CustomHttpPattern";
     const PACKAGE: &'static str = "google.api";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("google.api.{}", Self::NAME)
+        "google.api.CustomHttpPattern".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/google.api.CustomHttpPattern".into()
     }
 }
diff --git a/crates/proto/src/gen/ibc.applications.transfer.v1.rs b/crates/proto/src/gen/ibc.applications.transfer.v1.rs
index eb7e290e45..efd11eb84c 100644
--- a/crates/proto/src/gen/ibc.applications.transfer.v1.rs
+++ b/crates/proto/src/gen/ibc.applications.transfer.v1.rs
@@ -1,7 +1,14 @@
+// This file is @generated by prost-build.
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query provides defines the gRPC querier service.
@@ -24,8 +31,8 @@ pub mod query_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -50,7 +57,7 @@ pub mod query_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -101,8 +108,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -133,8 +139,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -165,8 +170,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -195,8 +199,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -227,8 +230,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -262,8 +264,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -286,11 +287,17 @@ pub mod query_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServer.
     #[async_trait]
-    pub trait Query: Send + Sync + 'static {
+    pub trait Query: std::marker::Send + std::marker::Sync + 'static {
         /// DenomTrace queries a denomination trace information.
         async fn denom_trace(
             &self,
@@ -366,20 +373,18 @@ pub mod query_server {
     }
     /// Query provides defines the gRPC querier service.
     #[derive(Debug)]
-    pub struct QueryServer<T: Query> {
-        inner: _Inner<T>,
+    pub struct QueryServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: Query> QueryServer<T> {
+    impl<T> QueryServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -429,8 +434,8 @@ pub mod query_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServer<T>
     where
         T: Query,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -442,7 +447,6 @@ pub mod query_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/ibc.applications.transfer.v1.Query/DenomTrace" => {
                     #[allow(non_camel_case_types)]
@@ -476,7 +480,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = DenomTraceSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -525,7 +528,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = DenomTracesSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -574,7 +576,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ParamsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -623,7 +624,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = DenomHashSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -672,7 +672,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = EscrowAddressSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -721,7 +720,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = TotalEscrowForDenomSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -740,20 +738,25 @@ pub mod query_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: Query> Clone for QueryServer<T> {
+    impl<T> Clone for QueryServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -765,17 +768,9 @@ pub mod query_server {
             }
         }
     }
-    impl<T: Query> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: Query> tonic::server::NamedService for QueryServer<T> {
-        const NAME: &'static str = "ibc.applications.transfer.v1.Query";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "ibc.applications.transfer.v1.Query";
+    impl<T> tonic::server::NamedService for QueryServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/ibc.core.channel.v1.rs b/crates/proto/src/gen/ibc.core.channel.v1.rs
index bfc483f8af..19af5dec15 100644
--- a/crates/proto/src/gen/ibc.core.channel.v1.rs
+++ b/crates/proto/src/gen/ibc.core.channel.v1.rs
@@ -1,7 +1,14 @@
+// This file is @generated by prost-build.
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query provides defines the gRPC querier service
@@ -24,8 +31,8 @@ pub mod query_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -50,7 +57,7 @@ pub mod query_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -99,8 +106,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -127,8 +133,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -158,8 +163,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -191,8 +195,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -224,8 +227,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -256,8 +258,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -289,8 +290,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -322,8 +322,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -352,8 +351,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -385,8 +383,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -421,8 +418,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -454,8 +450,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -484,8 +479,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -516,8 +510,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -537,11 +530,17 @@ pub mod query_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServer.
     #[async_trait]
-    pub trait Query: Send + Sync + 'static {
+    pub trait Query: std::marker::Send + std::marker::Sync + 'static {
         /// Channel queries an IBC Channel.
         async fn channel(
             &self,
@@ -717,20 +716,18 @@ pub mod query_server {
     }
     /// Query provides defines the gRPC querier service
     #[derive(Debug)]
-    pub struct QueryServer<T: Query> {
-        inner: _Inner<T>,
+    pub struct QueryServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: Query> QueryServer<T> {
+    impl<T> QueryServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -780,8 +777,8 @@ pub mod query_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServer<T>
     where
         T: Query,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -793,7 +790,6 @@ pub mod query_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/ibc.core.channel.v1.Query/Channel" => {
                     #[allow(non_camel_case_types)]
@@ -827,7 +823,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ChannelSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -876,7 +871,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ChannelsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -925,7 +919,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ConnectionChannelsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -974,7 +967,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ChannelClientStateSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1023,7 +1015,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ChannelConsensusStateSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1072,7 +1063,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = PacketCommitmentSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1121,7 +1111,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = PacketCommitmentsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1170,7 +1159,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = PacketReceiptSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1219,7 +1207,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = PacketAcknowledgementSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1268,7 +1255,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = PacketAcknowledgementsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1317,7 +1303,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = UnreceivedPacketsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1366,7 +1351,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = UnreceivedAcksSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1415,7 +1399,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = NextSequenceReceiveSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1464,7 +1447,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = NextSequenceSendSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1483,20 +1465,25 @@ pub mod query_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: Query> Clone for QueryServer<T> {
+    impl<T> Clone for QueryServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -1508,17 +1495,9 @@ pub mod query_server {
             }
         }
     }
-    impl<T: Query> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: Query> tonic::server::NamedService for QueryServer<T> {
-        const NAME: &'static str = "ibc.core.channel.v1.Query";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "ibc.core.channel.v1.Query";
+    impl<T> tonic::server::NamedService for QueryServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/ibc.core.client.v1.rs b/crates/proto/src/gen/ibc.core.client.v1.rs
index aa8983788e..091eb96dec 100644
--- a/crates/proto/src/gen/ibc.core.client.v1.rs
+++ b/crates/proto/src/gen/ibc.core.client.v1.rs
@@ -1,7 +1,14 @@
+// This file is @generated by prost-build.
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query provides defines the gRPC querier service
@@ -24,8 +31,8 @@ pub mod query_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -50,7 +57,7 @@ pub mod query_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -101,8 +108,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -131,8 +137,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -162,8 +167,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -193,8 +197,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -223,8 +226,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -255,8 +257,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -285,8 +286,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -315,8 +315,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -347,8 +346,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -368,11 +366,17 @@ pub mod query_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServer.
     #[async_trait]
-    pub trait Query: Send + Sync + 'static {
+    pub trait Query: std::marker::Send + std::marker::Sync + 'static {
         /// ClientState queries an IBC light client.
         async fn client_state(
             &self,
@@ -486,20 +490,18 @@ pub mod query_server {
     }
     /// Query provides defines the gRPC querier service
     #[derive(Debug)]
-    pub struct QueryServer<T: Query> {
-        inner: _Inner<T>,
+    pub struct QueryServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: Query> QueryServer<T> {
+    impl<T> QueryServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -549,8 +551,8 @@ pub mod query_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServer<T>
     where
         T: Query,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -562,7 +564,6 @@ pub mod query_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/ibc.core.client.v1.Query/ClientState" => {
                     #[allow(non_camel_case_types)]
@@ -596,7 +597,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ClientStateSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -645,7 +645,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ClientStatesSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -694,7 +693,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ConsensusStateSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -743,7 +741,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ConsensusStatesSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -792,7 +789,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ConsensusStateHeightsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -841,7 +837,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ClientStatusSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -890,7 +885,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ClientParamsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -939,7 +933,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = UpgradedClientStateSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -989,7 +982,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = UpgradedConsensusStateSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1008,20 +1000,25 @@ pub mod query_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: Query> Clone for QueryServer<T> {
+    impl<T> Clone for QueryServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -1033,17 +1030,9 @@ pub mod query_server {
             }
         }
     }
-    impl<T: Query> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: Query> tonic::server::NamedService for QueryServer<T> {
-        const NAME: &'static str = "ibc.core.client.v1.Query";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "ibc.core.client.v1.Query";
+    impl<T> tonic::server::NamedService for QueryServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/ibc.core.connection.v1.rs b/crates/proto/src/gen/ibc.core.connection.v1.rs
index a9e9ad151d..24f8f6d06e 100644
--- a/crates/proto/src/gen/ibc.core.connection.v1.rs
+++ b/crates/proto/src/gen/ibc.core.connection.v1.rs
@@ -1,7 +1,14 @@
+// This file is @generated by prost-build.
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query provides defines the gRPC querier service
@@ -24,8 +31,8 @@ pub mod query_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -50,7 +57,7 @@ pub mod query_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -101,8 +108,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -131,8 +137,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -162,8 +167,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -195,8 +199,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -231,8 +234,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -266,8 +268,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -287,11 +288,17 @@ pub mod query_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServer.
     #[async_trait]
-    pub trait Query: Send + Sync + 'static {
+    pub trait Query: std::marker::Send + std::marker::Sync + 'static {
         /// Connection queries an IBC connection end.
         async fn connection(
             &self,
@@ -370,20 +377,18 @@ pub mod query_server {
     }
     /// Query provides defines the gRPC querier service
     #[derive(Debug)]
-    pub struct QueryServer<T: Query> {
-        inner: _Inner<T>,
+    pub struct QueryServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: Query> QueryServer<T> {
+    impl<T> QueryServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -433,8 +438,8 @@ pub mod query_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServer<T>
     where
         T: Query,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -446,7 +451,6 @@ pub mod query_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/ibc.core.connection.v1.Query/Connection" => {
                     #[allow(non_camel_case_types)]
@@ -480,7 +484,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ConnectionSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -529,7 +532,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ConnectionsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -578,7 +580,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ClientConnectionsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -627,7 +628,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ConnectionClientStateSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -677,7 +677,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ConnectionConsensusStateSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -726,7 +725,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ConnectionParamsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -745,20 +743,25 @@ pub mod query_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: Query> Clone for QueryServer<T> {
+    impl<T> Clone for QueryServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -770,17 +773,9 @@ pub mod query_server {
             }
         }
     }
-    impl<T: Query> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: Query> tonic::server::NamedService for QueryServer<T> {
-        const NAME: &'static str = "ibc.core.connection.v1.Query";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "ibc.core.connection.v1.Query";
+    impl<T> tonic::server::NamedService for QueryServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/noble.forwarding.v1.rs b/crates/proto/src/gen/noble.forwarding.v1.rs
index 1bfadd3576..2d327011c7 100644
--- a/crates/proto/src/gen/noble.forwarding.v1.rs
+++ b/crates/proto/src/gen/noble.forwarding.v1.rs
@@ -1,4 +1,4 @@
-#[allow(clippy::derive_partial_eq_without_eq)]
+// This file is @generated by prost-build.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ForwardingAccount {
     #[prost(message, optional, tag = "1")]
@@ -16,10 +16,12 @@ impl ::prost::Name for ForwardingAccount {
     const NAME: &'static str = "ForwardingAccount";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.ForwardingAccount".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.ForwardingAccount".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ForwardingPubKey {
     #[prost(bytes = "vec", tag = "1")]
@@ -29,10 +31,12 @@ impl ::prost::Name for ForwardingPubKey {
     const NAME: &'static str = "ForwardingPubKey";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.ForwardingPubKey".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.ForwardingPubKey".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GenesisState {
     #[prost(map = "string, uint64", tag = "1")]
@@ -55,10 +59,12 @@ impl ::prost::Name for GenesisState {
     const NAME: &'static str = "GenesisState";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.GenesisState".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.GenesisState".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RegisterAccountData {
     #[prost(string, tag = "1")]
@@ -70,10 +76,12 @@ impl ::prost::Name for RegisterAccountData {
     const NAME: &'static str = "RegisterAccountData";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.RegisterAccountData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.RegisterAccountData".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RegisterAccountMemo {
     #[prost(message, optional, tag = "1")]
@@ -81,7 +89,6 @@ pub struct RegisterAccountMemo {
 }
 /// Nested message and enum types in `RegisterAccountMemo`.
 pub mod register_account_memo {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct RegisterAccountDataWrapper {
         #[prost(message, optional, tag = "1")]
@@ -91,9 +98,10 @@ pub mod register_account_memo {
         const NAME: &'static str = "RegisterAccountDataWrapper";
         const PACKAGE: &'static str = "noble.forwarding.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "noble.forwarding.v1.RegisterAccountMemo.{}", Self::NAME
-            )
+            "noble.forwarding.v1.RegisterAccountMemo.RegisterAccountDataWrapper".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/noble.forwarding.v1.RegisterAccountMemo.RegisterAccountDataWrapper".into()
         }
     }
 }
@@ -101,10 +109,12 @@ impl ::prost::Name for RegisterAccountMemo {
     const NAME: &'static str = "RegisterAccountMemo";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.RegisterAccountMemo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.RegisterAccountMemo".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryAddress {
     #[prost(string, tag = "1")]
@@ -116,10 +126,12 @@ impl ::prost::Name for QueryAddress {
     const NAME: &'static str = "QueryAddress";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.QueryAddress".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.QueryAddress".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryAddressResponse {
     #[prost(string, tag = "1")]
@@ -131,20 +143,24 @@ impl ::prost::Name for QueryAddressResponse {
     const NAME: &'static str = "QueryAddressResponse";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.QueryAddressResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.QueryAddressResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct QueryStats {}
 impl ::prost::Name for QueryStats {
     const NAME: &'static str = "QueryStats";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.QueryStats".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.QueryStats".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryStatsResponse {
     #[prost(map = "string, message", tag = "1")]
@@ -154,10 +170,12 @@ impl ::prost::Name for QueryStatsResponse {
     const NAME: &'static str = "QueryStatsResponse";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.QueryStatsResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.QueryStatsResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryStatsByChannel {
     #[prost(string, tag = "1")]
@@ -167,10 +185,12 @@ impl ::prost::Name for QueryStatsByChannel {
     const NAME: &'static str = "QueryStatsByChannel";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.QueryStatsByChannel".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.QueryStatsByChannel".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct QueryStatsByChannelResponse {
     #[prost(uint64, tag = "1")]
@@ -186,10 +206,12 @@ impl ::prost::Name for QueryStatsByChannelResponse {
     const NAME: &'static str = "QueryStatsByChannelResponse";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.QueryStatsByChannelResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.QueryStatsByChannelResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Stats {
     #[prost(string, tag = "1")]
@@ -207,13 +229,22 @@ impl ::prost::Name for Stats {
     const NAME: &'static str = "Stats";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.Stats".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.Stats".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     #[derive(Debug, Clone)]
@@ -235,8 +266,8 @@ pub mod query_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -261,7 +292,7 @@ pub mod query_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -307,8 +338,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -332,8 +362,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -357,8 +386,7 @@ pub mod query_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -376,11 +404,17 @@ pub mod query_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServer.
     #[async_trait]
-    pub trait Query: Send + Sync + 'static {
+    pub trait Query: std::marker::Send + std::marker::Sync + 'static {
         async fn address(
             &self,
             request: tonic::Request<super::QueryAddress>,
@@ -404,20 +438,18 @@ pub mod query_server {
         >;
     }
     #[derive(Debug)]
-    pub struct QueryServer<T: Query> {
-        inner: _Inner<T>,
+    pub struct QueryServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: Query> QueryServer<T> {
+    impl<T> QueryServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -467,8 +499,8 @@ pub mod query_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServer<T>
     where
         T: Query,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -480,7 +512,6 @@ pub mod query_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/noble.forwarding.v1.Query/Address" => {
                     #[allow(non_camel_case_types)]
@@ -509,7 +540,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AddressSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -553,7 +583,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = StatsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -599,7 +628,6 @@ pub mod query_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = StatsByChannelSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -618,20 +646,25 @@ pub mod query_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: Query> Clone for QueryServer<T> {
+    impl<T> Clone for QueryServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -643,21 +676,12 @@ pub mod query_server {
             }
         }
     }
-    impl<T: Query> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: Query> tonic::server::NamedService for QueryServer<T> {
-        const NAME: &'static str = "noble.forwarding.v1.Query";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "noble.forwarding.v1.Query";
+    impl<T> tonic::server::NamedService for QueryServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MsgRegisterAccount {
     #[prost(string, tag = "1")]
@@ -671,10 +695,12 @@ impl ::prost::Name for MsgRegisterAccount {
     const NAME: &'static str = "MsgRegisterAccount";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.MsgRegisterAccount".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.MsgRegisterAccount".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MsgRegisterAccountResponse {
     #[prost(string, tag = "1")]
@@ -684,10 +710,12 @@ impl ::prost::Name for MsgRegisterAccountResponse {
     const NAME: &'static str = "MsgRegisterAccountResponse";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.MsgRegisterAccountResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.MsgRegisterAccountResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MsgClearAccount {
     #[prost(string, tag = "1")]
@@ -699,23 +727,34 @@ impl ::prost::Name for MsgClearAccount {
     const NAME: &'static str = "MsgClearAccount";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.MsgClearAccount".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.MsgClearAccount".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct MsgClearAccountResponse {}
 impl ::prost::Name for MsgClearAccountResponse {
     const NAME: &'static str = "MsgClearAccountResponse";
     const PACKAGE: &'static str = "noble.forwarding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("noble.forwarding.v1.{}", Self::NAME)
+        "noble.forwarding.v1.MsgClearAccountResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/noble.forwarding.v1.MsgClearAccountResponse".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod msg_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     #[derive(Debug, Clone)]
@@ -737,8 +776,8 @@ pub mod msg_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -763,7 +802,7 @@ pub mod msg_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             MsgClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -809,8 +848,7 @@ pub mod msg_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -834,8 +872,7 @@ pub mod msg_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -853,11 +890,17 @@ pub mod msg_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod msg_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with MsgServer.
     #[async_trait]
-    pub trait Msg: Send + Sync + 'static {
+    pub trait Msg: std::marker::Send + std::marker::Sync + 'static {
         async fn register_account(
             &self,
             request: tonic::Request<super::MsgRegisterAccount>,
@@ -874,20 +917,18 @@ pub mod msg_server {
         >;
     }
     #[derive(Debug)]
-    pub struct MsgServer<T: Msg> {
-        inner: _Inner<T>,
+    pub struct MsgServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: Msg> MsgServer<T> {
+    impl<T> MsgServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -937,8 +978,8 @@ pub mod msg_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for MsgServer<T>
     where
         T: Msg,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -950,7 +991,6 @@ pub mod msg_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/noble.forwarding.v1.Msg/RegisterAccount" => {
                     #[allow(non_camel_case_types)]
@@ -979,7 +1019,6 @@ pub mod msg_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = RegisterAccountSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1023,7 +1062,6 @@ pub mod msg_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ClearAccountSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1042,20 +1080,25 @@ pub mod msg_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: Msg> Clone for MsgServer<T> {
+    impl<T> Clone for MsgServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -1067,17 +1110,9 @@ pub mod msg_server {
             }
         }
     }
-    impl<T: Msg> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: Msg> tonic::server::NamedService for MsgServer<T> {
-        const NAME: &'static str = "noble.forwarding.v1.Msg";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "noble.forwarding.v1.Msg";
+    impl<T> tonic::server::NamedService for MsgServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.cnidarium.v1.rs b/crates/proto/src/gen/penumbra.cnidarium.v1.rs
deleted file mode 100644
index 7a04181967..0000000000
--- a/crates/proto/src/gen/penumbra.cnidarium.v1.rs
+++ /dev/null
@@ -1,815 +0,0 @@
-/// Performs a key-value query against the nonverifiable storage,
-/// using a byte-encoded key.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct NonVerifiableKeyValueRequest {
-    #[prost(message, optional, tag = "1")]
-    pub key: ::core::option::Option<non_verifiable_key_value_request::Key>,
-}
-/// Nested message and enum types in `NonVerifiableKeyValueRequest`.
-pub mod non_verifiable_key_value_request {
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct Key {
-        #[prost(bytes = "vec", tag = "1")]
-        pub inner: ::prost::alloc::vec::Vec<u8>,
-    }
-    impl ::prost::Name for Key {
-        const NAME: &'static str = "Key";
-        const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-        fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.cnidarium.v1.NonVerifiableKeyValueRequest.{}", Self::NAME
-            )
-        }
-    }
-}
-impl ::prost::Name for NonVerifiableKeyValueRequest {
-    const NAME: &'static str = "NonVerifiableKeyValueRequest";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct NonVerifiableKeyValueResponse {
-    /// The value corresponding to the specified key, if it was found.
-    #[prost(message, optional, tag = "1")]
-    pub value: ::core::option::Option<non_verifiable_key_value_response::Value>,
-}
-/// Nested message and enum types in `NonVerifiableKeyValueResponse`.
-pub mod non_verifiable_key_value_response {
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct Value {
-        #[prost(bytes = "vec", tag = "1")]
-        pub value: ::prost::alloc::vec::Vec<u8>,
-    }
-    impl ::prost::Name for Value {
-        const NAME: &'static str = "Value";
-        const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-        fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.cnidarium.v1.NonVerifiableKeyValueResponse.{}", Self::NAME
-            )
-        }
-    }
-}
-impl ::prost::Name for NonVerifiableKeyValueResponse {
-    const NAME: &'static str = "NonVerifiableKeyValueResponse";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// Performs a key-value query against the JMT, either by key or by key hash.
-///
-/// Proofs are only supported by key.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct KeyValueRequest {
-    /// If set, the key to fetch from storage.
-    #[prost(string, tag = "2")]
-    pub key: ::prost::alloc::string::String,
-    /// whether to return a proof
-    #[prost(bool, tag = "3")]
-    pub proof: bool,
-}
-impl ::prost::Name for KeyValueRequest {
-    const NAME: &'static str = "KeyValueRequest";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct KeyValueResponse {
-    /// The value corresponding to the specified key, if it was found.
-    #[prost(message, optional, tag = "1")]
-    pub value: ::core::option::Option<key_value_response::Value>,
-    /// A proof of existence or non-existence.
-    #[prost(message, optional, tag = "2")]
-    pub proof: ::core::option::Option<
-        ::ibc_proto::ibc::core::commitment::v1::MerkleProof,
-    >,
-}
-/// Nested message and enum types in `KeyValueResponse`.
-pub mod key_value_response {
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct Value {
-        #[prost(bytes = "vec", tag = "1")]
-        pub value: ::prost::alloc::vec::Vec<u8>,
-    }
-    impl ::prost::Name for Value {
-        const NAME: &'static str = "Value";
-        const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-        fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.cnidarium.v1.KeyValueResponse.{}", Self::NAME
-            )
-        }
-    }
-}
-impl ::prost::Name for KeyValueResponse {
-    const NAME: &'static str = "KeyValueResponse";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// Performs a prefixed key-value query, by string prefix.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PrefixValueRequest {
-    /// The prefix to fetch subkeys from storage.
-    #[prost(string, tag = "2")]
-    pub prefix: ::prost::alloc::string::String,
-}
-impl ::prost::Name for PrefixValueRequest {
-    const NAME: &'static str = "PrefixValueRequest";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PrefixValueResponse {
-    #[prost(string, tag = "1")]
-    pub key: ::prost::alloc::string::String,
-    #[prost(bytes = "vec", tag = "2")]
-    pub value: ::prost::alloc::vec::Vec<u8>,
-}
-impl ::prost::Name for PrefixValueResponse {
-    const NAME: &'static str = "PrefixValueResponse";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// Requests a stream of new key-value pairs that have been committed to the state.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct WatchRequest {
-    /// A regex for keys in the verifiable storage.
-    ///
-    /// Only key-value updates whose keys match this regex will be returned.
-    /// Note that the empty string matches all keys.
-    /// To exclude all keys, use the regex "$^", which matches no strings.
-    #[prost(string, tag = "1")]
-    pub key_regex: ::prost::alloc::string::String,
-    /// A regex for keys in the nonverifiable storage.
-    ///
-    /// Only key-value updates whose keys match this regex will be returned.
-    /// Note that the empty string matches all keys.
-    /// To exclude all keys, use the regex "$^", which matches no strings.
-    #[prost(string, tag = "2")]
-    pub nv_key_regex: ::prost::alloc::string::String,
-}
-impl ::prost::Name for WatchRequest {
-    const NAME: &'static str = "WatchRequest";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// A key-value pair that has been committed to the state.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct WatchResponse {
-    /// The state version the key-value pair was committed at.
-    #[prost(uint64, tag = "1")]
-    pub version: u64,
-    /// The entry that was committed.
-    #[prost(oneof = "watch_response::Entry", tags = "5, 6")]
-    pub entry: ::core::option::Option<watch_response::Entry>,
-}
-/// Nested message and enum types in `WatchResponse`.
-pub mod watch_response {
-    /// Elements of the verifiable storage have string keys.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct KeyValue {
-        #[prost(string, tag = "1")]
-        pub key: ::prost::alloc::string::String,
-        #[prost(bytes = "vec", tag = "2")]
-        pub value: ::prost::alloc::vec::Vec<u8>,
-        /// If set to true, the key-value pair was deleted.
-        /// This allows distinguishing a deleted key-value pair from a key-value pair whose value is empty.
-        #[prost(bool, tag = "3")]
-        pub deleted: bool,
-    }
-    impl ::prost::Name for KeyValue {
-        const NAME: &'static str = "KeyValue";
-        const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-        fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!("penumbra.cnidarium.v1.WatchResponse.{}", Self::NAME)
-        }
-    }
-    /// Elements of the nonverifiable storage have byte keys.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct NvKeyValue {
-        #[prost(bytes = "vec", tag = "1")]
-        pub key: ::prost::alloc::vec::Vec<u8>,
-        #[prost(bytes = "vec", tag = "2")]
-        pub value: ::prost::alloc::vec::Vec<u8>,
-        /// If set to true, the key-value pair was deleted.
-        /// This allows distinguishing a deleted key-value pair from a key-value pair whose value is empty.
-        #[prost(bool, tag = "3")]
-        pub deleted: bool,
-    }
-    impl ::prost::Name for NvKeyValue {
-        const NAME: &'static str = "NvKeyValue";
-        const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-        fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!("penumbra.cnidarium.v1.WatchResponse.{}", Self::NAME)
-        }
-    }
-    /// The entry that was committed.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Entry {
-        #[prost(message, tag = "5")]
-        Kv(KeyValue),
-        #[prost(message, tag = "6")]
-        NvKv(NvKeyValue),
-    }
-}
-impl ::prost::Name for WatchResponse {
-    const NAME: &'static str = "WatchResponse";
-    const PACKAGE: &'static str = "penumbra.cnidarium.v1";
-    fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.cnidarium.v1.{}", Self::NAME)
-    }
-}
-/// Generated client implementations.
-#[cfg(feature = "rpc")]
-pub mod query_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct QueryServiceClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl QueryServiceClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> QueryServiceClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> QueryServiceClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
-        {
-            QueryServiceClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        /// General-purpose key-value state query API, that can be used to query
-        /// arbitrary keys in the JMT storage.
-        pub async fn key_value(
-            &mut self,
-            request: impl tonic::IntoRequest<super::KeyValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::KeyValueResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/penumbra.cnidarium.v1.QueryService/KeyValue",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(
-                    GrpcMethod::new("penumbra.cnidarium.v1.QueryService", "KeyValue"),
-                );
-            self.inner.unary(req, path, codec).await
-        }
-        /// General-purpose key-value state query API, that can be used to query
-        /// arbitrary keys in the non-verifiable storage.
-        pub async fn non_verifiable_key_value(
-            &mut self,
-            request: impl tonic::IntoRequest<super::NonVerifiableKeyValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::NonVerifiableKeyValueResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/penumbra.cnidarium.v1.QueryService/NonVerifiableKeyValue",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(
-                    GrpcMethod::new(
-                        "penumbra.cnidarium.v1.QueryService",
-                        "NonVerifiableKeyValue",
-                    ),
-                );
-            self.inner.unary(req, path, codec).await
-        }
-        /// General-purpose prefixed key-value state query API, that can be used to query
-        /// arbitrary prefixes in the JMT storage.
-        pub async fn prefix_value(
-            &mut self,
-            request: impl tonic::IntoRequest<super::PrefixValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<tonic::codec::Streaming<super::PrefixValueResponse>>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/penumbra.cnidarium.v1.QueryService/PrefixValue",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(
-                    GrpcMethod::new("penumbra.cnidarium.v1.QueryService", "PrefixValue"),
-                );
-            self.inner.server_streaming(req, path, codec).await
-        }
-        /// Subscribes to a stream of key-value updates, with regex filtering on keys.
-        pub async fn watch(
-            &mut self,
-            request: impl tonic::IntoRequest<super::WatchRequest>,
-        ) -> std::result::Result<
-            tonic::Response<tonic::codec::Streaming<super::WatchResponse>>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/penumbra.cnidarium.v1.QueryService/Watch",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("penumbra.cnidarium.v1.QueryService", "Watch"));
-            self.inner.server_streaming(req, path, codec).await
-        }
-    }
-}
-/// Generated server implementations.
-#[cfg(feature = "rpc")]
-pub mod query_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    /// Generated trait containing gRPC methods that should be implemented for use with QueryServiceServer.
-    #[async_trait]
-    pub trait QueryService: Send + Sync + 'static {
-        /// General-purpose key-value state query API, that can be used to query
-        /// arbitrary keys in the JMT storage.
-        async fn key_value(
-            &self,
-            request: tonic::Request<super::KeyValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::KeyValueResponse>,
-            tonic::Status,
-        >;
-        /// General-purpose key-value state query API, that can be used to query
-        /// arbitrary keys in the non-verifiable storage.
-        async fn non_verifiable_key_value(
-            &self,
-            request: tonic::Request<super::NonVerifiableKeyValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::NonVerifiableKeyValueResponse>,
-            tonic::Status,
-        >;
-        /// Server streaming response type for the PrefixValue method.
-        type PrefixValueStream: tonic::codegen::tokio_stream::Stream<
-                Item = std::result::Result<super::PrefixValueResponse, tonic::Status>,
-            >
-            + Send
-            + 'static;
-        /// General-purpose prefixed key-value state query API, that can be used to query
-        /// arbitrary prefixes in the JMT storage.
-        async fn prefix_value(
-            &self,
-            request: tonic::Request<super::PrefixValueRequest>,
-        ) -> std::result::Result<
-            tonic::Response<Self::PrefixValueStream>,
-            tonic::Status,
-        >;
-        /// Server streaming response type for the Watch method.
-        type WatchStream: tonic::codegen::tokio_stream::Stream<
-                Item = std::result::Result<super::WatchResponse, tonic::Status>,
-            >
-            + Send
-            + 'static;
-        /// Subscribes to a stream of key-value updates, with regex filtering on keys.
-        async fn watch(
-            &self,
-            request: tonic::Request<super::WatchRequest>,
-        ) -> std::result::Result<tonic::Response<Self::WatchStream>, tonic::Status>;
-    }
-    #[derive(Debug)]
-    pub struct QueryServiceServer<T: QueryService> {
-        inner: _Inner<T>,
-        accept_compression_encodings: EnabledCompressionEncodings,
-        send_compression_encodings: EnabledCompressionEncodings,
-        max_decoding_message_size: Option<usize>,
-        max_encoding_message_size: Option<usize>,
-    }
-    struct _Inner<T>(Arc<T>);
-    impl<T: QueryService> QueryServiceServer<T> {
-        pub fn new(inner: T) -> Self {
-            Self::from_arc(Arc::new(inner))
-        }
-        pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
-            Self {
-                inner,
-                accept_compression_encodings: Default::default(),
-                send_compression_encodings: Default::default(),
-                max_decoding_message_size: None,
-                max_encoding_message_size: None,
-            }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> InterceptedService<Self, F>
-        where
-            F: tonic::service::Interceptor,
-        {
-            InterceptedService::new(Self::new(inner), interceptor)
-        }
-        /// Enable decompressing requests with the given encoding.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.accept_compression_encodings.enable(encoding);
-            self
-        }
-        /// Compress responses with the given encoding, if the client supports it.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.send_compression_encodings.enable(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.max_decoding_message_size = Some(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.max_encoding_message_size = Some(limit);
-            self
-        }
-    }
-    impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServiceServer<T>
-    where
-        T: QueryService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
-    {
-        type Response = http::Response<tonic::body::BoxBody>;
-        type Error = std::convert::Infallible;
-        type Future = BoxFuture<Self::Response, Self::Error>;
-        fn poll_ready(
-            &mut self,
-            _cx: &mut Context<'_>,
-        ) -> Poll<std::result::Result<(), Self::Error>> {
-            Poll::Ready(Ok(()))
-        }
-        fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
-            match req.uri().path() {
-                "/penumbra.cnidarium.v1.QueryService/KeyValue" => {
-                    #[allow(non_camel_case_types)]
-                    struct KeyValueSvc<T: QueryService>(pub Arc<T>);
-                    impl<
-                        T: QueryService,
-                    > tonic::server::UnaryService<super::KeyValueRequest>
-                    for KeyValueSvc<T> {
-                        type Response = super::KeyValueResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::KeyValueRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                <T as QueryService>::key_value(&inner, request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = KeyValueSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/penumbra.cnidarium.v1.QueryService/NonVerifiableKeyValue" => {
-                    #[allow(non_camel_case_types)]
-                    struct NonVerifiableKeyValueSvc<T: QueryService>(pub Arc<T>);
-                    impl<
-                        T: QueryService,
-                    > tonic::server::UnaryService<super::NonVerifiableKeyValueRequest>
-                    for NonVerifiableKeyValueSvc<T> {
-                        type Response = super::NonVerifiableKeyValueResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::NonVerifiableKeyValueRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                <T as QueryService>::non_verifiable_key_value(
-                                        &inner,
-                                        request,
-                                    )
-                                    .await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = NonVerifiableKeyValueSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/penumbra.cnidarium.v1.QueryService/PrefixValue" => {
-                    #[allow(non_camel_case_types)]
-                    struct PrefixValueSvc<T: QueryService>(pub Arc<T>);
-                    impl<
-                        T: QueryService,
-                    > tonic::server::ServerStreamingService<super::PrefixValueRequest>
-                    for PrefixValueSvc<T> {
-                        type Response = super::PrefixValueResponse;
-                        type ResponseStream = T::PrefixValueStream;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::ResponseStream>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::PrefixValueRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                <T as QueryService>::prefix_value(&inner, request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = PrefixValueSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.server_streaming(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/penumbra.cnidarium.v1.QueryService/Watch" => {
-                    #[allow(non_camel_case_types)]
-                    struct WatchSvc<T: QueryService>(pub Arc<T>);
-                    impl<
-                        T: QueryService,
-                    > tonic::server::ServerStreamingService<super::WatchRequest>
-                    for WatchSvc<T> {
-                        type Response = super::WatchResponse;
-                        type ResponseStream = T::WatchStream;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::ResponseStream>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::WatchRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                <T as QueryService>::watch(&inner, request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = WatchSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.server_streaming(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                _ => {
-                    Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
-                    })
-                }
-            }
-        }
-    }
-    impl<T: QueryService> Clone for QueryServiceServer<T> {
-        fn clone(&self) -> Self {
-            let inner = self.inner.clone();
-            Self {
-                inner,
-                accept_compression_encodings: self.accept_compression_encodings,
-                send_compression_encodings: self.send_compression_encodings,
-                max_decoding_message_size: self.max_decoding_message_size,
-                max_encoding_message_size: self.max_encoding_message_size,
-            }
-        }
-    }
-    impl<T: QueryService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: QueryService> tonic::server::NamedService for QueryServiceServer<T> {
-        const NAME: &'static str = "penumbra.cnidarium.v1.QueryService";
-    }
-}
diff --git a/crates/proto/src/gen/penumbra.cnidarium.v1.serde.rs b/crates/proto/src/gen/penumbra.cnidarium.v1.serde.rs
deleted file mode 100644
index 8751e80e6e..0000000000
--- a/crates/proto/src/gen/penumbra.cnidarium.v1.serde.rs
+++ /dev/null
@@ -1,1433 +0,0 @@
-impl serde::Serialize for KeyValueRequest {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key.is_empty() {
-            len += 1;
-        }
-        if self.proof {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.KeyValueRequest", len)?;
-        if !self.key.is_empty() {
-            struct_ser.serialize_field("key", &self.key)?;
-        }
-        if self.proof {
-            struct_ser.serialize_field("proof", &self.proof)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for KeyValueRequest {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-            "proof",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            Proof,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            "proof" => Ok(GeneratedField::Proof),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = KeyValueRequest;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.KeyValueRequest")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<KeyValueRequest, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                let mut proof__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::Proof => {
-                            if proof__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("proof"));
-                            }
-                            proof__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(KeyValueRequest {
-                    key: key__.unwrap_or_default(),
-                    proof: proof__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.KeyValueRequest", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for KeyValueResponse {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if self.value.is_some() {
-            len += 1;
-        }
-        if self.proof.is_some() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.KeyValueResponse", len)?;
-        if let Some(v) = self.value.as_ref() {
-            struct_ser.serialize_field("value", v)?;
-        }
-        if let Some(v) = self.proof.as_ref() {
-            struct_ser.serialize_field("proof", v)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for KeyValueResponse {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "value",
-            "proof",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Value,
-            Proof,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "value" => Ok(GeneratedField::Value),
-                            "proof" => Ok(GeneratedField::Proof),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = KeyValueResponse;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.KeyValueResponse")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<KeyValueResponse, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut value__ = None;
-                let mut proof__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = map_.next_value()?;
-                        }
-                        GeneratedField::Proof => {
-                            if proof__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("proof"));
-                            }
-                            proof__ = map_.next_value()?;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(KeyValueResponse {
-                    value: value__,
-                    proof: proof__,
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.KeyValueResponse", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for key_value_response::Value {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.KeyValueResponse.Value", len)?;
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for key_value_response::Value {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "value",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Value,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "value" => Ok(GeneratedField::Value),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = key_value_response::Value;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.KeyValueResponse.Value")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<key_value_response::Value, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut value__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(key_value_response::Value {
-                    value: value__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.KeyValueResponse.Value", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for NonVerifiableKeyValueRequest {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if self.key.is_some() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueRequest", len)?;
-        if let Some(v) = self.key.as_ref() {
-            struct_ser.serialize_field("key", v)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for NonVerifiableKeyValueRequest {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = NonVerifiableKeyValueRequest;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.NonVerifiableKeyValueRequest")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<NonVerifiableKeyValueRequest, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = map_.next_value()?;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(NonVerifiableKeyValueRequest {
-                    key: key__,
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueRequest", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for non_verifiable_key_value_request::Key {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.inner.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueRequest.Key", len)?;
-        if !self.inner.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for non_verifiable_key_value_request::Key {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "inner",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Inner,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "inner" => Ok(GeneratedField::Inner),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = non_verifiable_key_value_request::Key;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.NonVerifiableKeyValueRequest.Key")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<non_verifiable_key_value_request::Key, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut inner__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Inner => {
-                            if inner__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("inner"));
-                            }
-                            inner__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(non_verifiable_key_value_request::Key {
-                    inner: inner__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueRequest.Key", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for NonVerifiableKeyValueResponse {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if self.value.is_some() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueResponse", len)?;
-        if let Some(v) = self.value.as_ref() {
-            struct_ser.serialize_field("value", v)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for NonVerifiableKeyValueResponse {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "value",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Value,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "value" => Ok(GeneratedField::Value),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = NonVerifiableKeyValueResponse;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.NonVerifiableKeyValueResponse")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<NonVerifiableKeyValueResponse, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut value__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = map_.next_value()?;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(NonVerifiableKeyValueResponse {
-                    value: value__,
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueResponse", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for non_verifiable_key_value_response::Value {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueResponse.Value", len)?;
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for non_verifiable_key_value_response::Value {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "value",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Value,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "value" => Ok(GeneratedField::Value),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = non_verifiable_key_value_response::Value;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.NonVerifiableKeyValueResponse.Value")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<non_verifiable_key_value_response::Value, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut value__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(non_verifiable_key_value_response::Value {
-                    value: value__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.NonVerifiableKeyValueResponse.Value", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for PrefixValueRequest {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.prefix.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.PrefixValueRequest", len)?;
-        if !self.prefix.is_empty() {
-            struct_ser.serialize_field("prefix", &self.prefix)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for PrefixValueRequest {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "prefix",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Prefix,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "prefix" => Ok(GeneratedField::Prefix),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = PrefixValueRequest;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.PrefixValueRequest")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<PrefixValueRequest, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut prefix__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Prefix => {
-                            if prefix__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("prefix"));
-                            }
-                            prefix__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(PrefixValueRequest {
-                    prefix: prefix__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.PrefixValueRequest", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for PrefixValueResponse {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key.is_empty() {
-            len += 1;
-        }
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.PrefixValueResponse", len)?;
-        if !self.key.is_empty() {
-            struct_ser.serialize_field("key", &self.key)?;
-        }
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for PrefixValueResponse {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-            "value",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            Value,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            "value" => Ok(GeneratedField::Value),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = PrefixValueResponse;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.PrefixValueResponse")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<PrefixValueResponse, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                let mut value__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(PrefixValueResponse {
-                    key: key__.unwrap_or_default(),
-                    value: value__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.PrefixValueResponse", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for WatchRequest {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key_regex.is_empty() {
-            len += 1;
-        }
-        if !self.nv_key_regex.is_empty() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.WatchRequest", len)?;
-        if !self.key_regex.is_empty() {
-            struct_ser.serialize_field("keyRegex", &self.key_regex)?;
-        }
-        if !self.nv_key_regex.is_empty() {
-            struct_ser.serialize_field("nvKeyRegex", &self.nv_key_regex)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for WatchRequest {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key_regex",
-            "keyRegex",
-            "nv_key_regex",
-            "nvKeyRegex",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            KeyRegex,
-            NvKeyRegex,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "keyRegex" | "key_regex" => Ok(GeneratedField::KeyRegex),
-                            "nvKeyRegex" | "nv_key_regex" => Ok(GeneratedField::NvKeyRegex),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = WatchRequest;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.WatchRequest")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<WatchRequest, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key_regex__ = None;
-                let mut nv_key_regex__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::KeyRegex => {
-                            if key_regex__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("keyRegex"));
-                            }
-                            key_regex__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::NvKeyRegex => {
-                            if nv_key_regex__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("nvKeyRegex"));
-                            }
-                            nv_key_regex__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(WatchRequest {
-                    key_regex: key_regex__.unwrap_or_default(),
-                    nv_key_regex: nv_key_regex__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.WatchRequest", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for WatchResponse {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if self.version != 0 {
-            len += 1;
-        }
-        if self.entry.is_some() {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.WatchResponse", len)?;
-        if self.version != 0 {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("version", ToString::to_string(&self.version).as_str())?;
-        }
-        if let Some(v) = self.entry.as_ref() {
-            match v {
-                watch_response::Entry::Kv(v) => {
-                    struct_ser.serialize_field("kv", v)?;
-                }
-                watch_response::Entry::NvKv(v) => {
-                    struct_ser.serialize_field("nvKv", v)?;
-                }
-            }
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for WatchResponse {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "version",
-            "kv",
-            "nv_kv",
-            "nvKv",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Version,
-            Kv,
-            NvKv,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "version" => Ok(GeneratedField::Version),
-                            "kv" => Ok(GeneratedField::Kv),
-                            "nvKv" | "nv_kv" => Ok(GeneratedField::NvKv),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = WatchResponse;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.WatchResponse")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<WatchResponse, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut version__ = None;
-                let mut entry__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Version => {
-                            if version__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("version"));
-                            }
-                            version__ = 
-                                Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::Kv => {
-                            if entry__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("kv"));
-                            }
-                            entry__ = map_.next_value::<::std::option::Option<_>>()?.map(watch_response::Entry::Kv)
-;
-                        }
-                        GeneratedField::NvKv => {
-                            if entry__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("nvKv"));
-                            }
-                            entry__ = map_.next_value::<::std::option::Option<_>>()?.map(watch_response::Entry::NvKv)
-;
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(WatchResponse {
-                    version: version__.unwrap_or_default(),
-                    entry: entry__,
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.WatchResponse", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for watch_response::KeyValue {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key.is_empty() {
-            len += 1;
-        }
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        if self.deleted {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.WatchResponse.KeyValue", len)?;
-        if !self.key.is_empty() {
-            struct_ser.serialize_field("key", &self.key)?;
-        }
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        if self.deleted {
-            struct_ser.serialize_field("deleted", &self.deleted)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for watch_response::KeyValue {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-            "value",
-            "deleted",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            Value,
-            Deleted,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            "value" => Ok(GeneratedField::Value),
-                            "deleted" => Ok(GeneratedField::Deleted),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = watch_response::KeyValue;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.WatchResponse.KeyValue")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<watch_response::KeyValue, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                let mut value__ = None;
-                let mut deleted__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::Deleted => {
-                            if deleted__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("deleted"));
-                            }
-                            deleted__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(watch_response::KeyValue {
-                    key: key__.unwrap_or_default(),
-                    value: value__.unwrap_or_default(),
-                    deleted: deleted__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.WatchResponse.KeyValue", FIELDS, GeneratedVisitor)
-    }
-}
-impl serde::Serialize for watch_response::NvKeyValue {
-    #[allow(deprecated)]
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        use serde::ser::SerializeStruct;
-        let mut len = 0;
-        if !self.key.is_empty() {
-            len += 1;
-        }
-        if !self.value.is_empty() {
-            len += 1;
-        }
-        if self.deleted {
-            len += 1;
-        }
-        let mut struct_ser = serializer.serialize_struct("penumbra.cnidarium.v1.WatchResponse.NvKeyValue", len)?;
-        if !self.key.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("key", pbjson::private::base64::encode(&self.key).as_str())?;
-        }
-        if !self.value.is_empty() {
-            #[allow(clippy::needless_borrow)]
-            struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
-        }
-        if self.deleted {
-            struct_ser.serialize_field("deleted", &self.deleted)?;
-        }
-        struct_ser.end()
-    }
-}
-impl<'de> serde::Deserialize<'de> for watch_response::NvKeyValue {
-    #[allow(deprecated)]
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        const FIELDS: &[&str] = &[
-            "key",
-            "value",
-            "deleted",
-        ];
-
-        #[allow(clippy::enum_variant_names)]
-        enum GeneratedField {
-            Key,
-            Value,
-            Deleted,
-            __SkipField__,
-        }
-        impl<'de> serde::Deserialize<'de> for GeneratedField {
-            fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
-            where
-                D: serde::Deserializer<'de>,
-            {
-                struct GeneratedVisitor;
-
-                impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-                    type Value = GeneratedField;
-
-                    fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                        write!(formatter, "expected one of: {:?}", &FIELDS)
-                    }
-
-                    #[allow(unused_variables)]
-                    fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
-                    where
-                        E: serde::de::Error,
-                    {
-                        match value {
-                            "key" => Ok(GeneratedField::Key),
-                            "value" => Ok(GeneratedField::Value),
-                            "deleted" => Ok(GeneratedField::Deleted),
-                            _ => Ok(GeneratedField::__SkipField__),
-                        }
-                    }
-                }
-                deserializer.deserialize_identifier(GeneratedVisitor)
-            }
-        }
-        struct GeneratedVisitor;
-        impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = watch_response::NvKeyValue;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                formatter.write_str("struct penumbra.cnidarium.v1.WatchResponse.NvKeyValue")
-            }
-
-            fn visit_map<V>(self, mut map_: V) -> std::result::Result<watch_response::NvKeyValue, V::Error>
-                where
-                    V: serde::de::MapAccess<'de>,
-            {
-                let mut key__ = None;
-                let mut value__ = None;
-                let mut deleted__ = None;
-                while let Some(k) = map_.next_key()? {
-                    match k {
-                        GeneratedField::Key => {
-                            if key__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("key"));
-                            }
-                            key__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::Value => {
-                            if value__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("value"));
-                            }
-                            value__ = 
-                                Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
-                            ;
-                        }
-                        GeneratedField::Deleted => {
-                            if deleted__.is_some() {
-                                return Err(serde::de::Error::duplicate_field("deleted"));
-                            }
-                            deleted__ = Some(map_.next_value()?);
-                        }
-                        GeneratedField::__SkipField__ => {
-                            let _ = map_.next_value::<serde::de::IgnoredAny>()?;
-                        }
-                    }
-                }
-                Ok(watch_response::NvKeyValue {
-                    key: key__.unwrap_or_default(),
-                    value: value__.unwrap_or_default(),
-                    deleted: deleted__.unwrap_or_default(),
-                })
-            }
-        }
-        deserializer.deserialize_struct("penumbra.cnidarium.v1.WatchResponse.NvKeyValue", FIELDS, GeneratedVisitor)
-    }
-}
diff --git a/crates/proto/src/gen/penumbra.core.app.v1.rs b/crates/proto/src/gen/penumbra.core.app.v1.rs
index ced7c4b31f..5030d31632 100644
--- a/crates/proto/src/gen/penumbra.core.app.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.app.v1.rs
@@ -1,6 +1,6 @@
+// This file is @generated by prost-build.
 /// Requests the list of all transactions that occurred within a given block.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct TransactionsByHeightRequest {
     /// The block height to retrieve.
     #[prost(uint64, tag = "2")]
@@ -10,11 +10,13 @@ impl ::prost::Name for TransactionsByHeightRequest {
     const NAME: &'static str = "TransactionsByHeightRequest";
     const PACKAGE: &'static str = "penumbra.core.app.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.app.v1.{}", Self::NAME)
+        "penumbra.core.app.v1.TransactionsByHeightRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.app.v1.TransactionsByHeightRequest".into()
     }
 }
 /// A transaction that appeared within a given block.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionsByHeightResponse {
     /// The transactions.
@@ -30,10 +32,12 @@ impl ::prost::Name for TransactionsByHeightResponse {
     const NAME: &'static str = "TransactionsByHeightResponse";
     const PACKAGE: &'static str = "penumbra.core.app.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.app.v1.{}", Self::NAME)
+        "penumbra.core.app.v1.TransactionsByHeightResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.app.v1.TransactionsByHeightResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AppParameters {
     /// The chain identifier.
@@ -99,21 +103,25 @@ impl ::prost::Name for AppParameters {
     const NAME: &'static str = "AppParameters";
     const PACKAGE: &'static str = "penumbra.core.app.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.app.v1.{}", Self::NAME)
+        "penumbra.core.app.v1.AppParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.app.v1.AppParameters".into()
     }
 }
 /// Requests the global configuration data for the app.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct AppParametersRequest {}
 impl ::prost::Name for AppParametersRequest {
     const NAME: &'static str = "AppParametersRequest";
     const PACKAGE: &'static str = "penumbra.core.app.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.app.v1.{}", Self::NAME)
+        "penumbra.core.app.v1.AppParametersRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.app.v1.AppParametersRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AppParametersResponse {
     #[prost(message, optional, tag = "1")]
@@ -123,10 +131,12 @@ impl ::prost::Name for AppParametersResponse {
     const NAME: &'static str = "AppParametersResponse";
     const PACKAGE: &'static str = "penumbra.core.app.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.app.v1.{}", Self::NAME)
+        "penumbra.core.app.v1.AppParametersResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.app.v1.AppParametersResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GenesisAppState {
     #[prost(oneof = "genesis_app_state::GenesisAppState", tags = "1, 2")]
@@ -134,7 +144,6 @@ pub struct GenesisAppState {
 }
 /// Nested message and enum types in `GenesisAppState`.
 pub mod genesis_app_state {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum GenesisAppState {
         #[prost(message, tag = "1")]
@@ -147,10 +156,12 @@ impl ::prost::Name for GenesisAppState {
     const NAME: &'static str = "GenesisAppState";
     const PACKAGE: &'static str = "penumbra.core.app.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.app.v1.{}", Self::NAME)
+        "penumbra.core.app.v1.GenesisAppState".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.app.v1.GenesisAppState".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GenesisContent {
     /// The initial chain identifier.
@@ -216,13 +227,22 @@ impl ::prost::Name for GenesisContent {
     const NAME: &'static str = "GenesisContent";
     const PACKAGE: &'static str = "penumbra.core.app.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.app.v1.{}", Self::NAME)
+        "penumbra.core.app.v1.GenesisContent".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.app.v1.GenesisContent".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query operations for the overall Penumbra application.
@@ -245,8 +265,8 @@ pub mod query_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -271,7 +291,7 @@ pub mod query_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -318,8 +338,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -346,8 +365,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -370,11 +388,17 @@ pub mod query_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServiceServer.
     #[async_trait]
-    pub trait QueryService: Send + Sync + 'static {
+    pub trait QueryService: std::marker::Send + std::marker::Sync + 'static {
         /// Gets the app parameters.
         async fn app_parameters(
             &self,
@@ -394,20 +418,18 @@ pub mod query_service_server {
     }
     /// Query operations for the overall Penumbra application.
     #[derive(Debug)]
-    pub struct QueryServiceServer<T: QueryService> {
-        inner: _Inner<T>,
+    pub struct QueryServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: QueryService> QueryServiceServer<T> {
+    impl<T> QueryServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -457,8 +479,8 @@ pub mod query_service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServiceServer<T>
     where
         T: QueryService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -470,7 +492,6 @@ pub mod query_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.core.app.v1.QueryService/AppParameters" => {
                     #[allow(non_camel_case_types)]
@@ -501,7 +522,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AppParametersSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -548,7 +568,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = TransactionsByHeightSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -567,20 +586,25 @@ pub mod query_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: QueryService> Clone for QueryServiceServer<T> {
+    impl<T> Clone for QueryServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -592,17 +616,9 @@ pub mod query_service_server {
             }
         }
     }
-    impl<T: QueryService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: QueryService> tonic::server::NamedService for QueryServiceServer<T> {
-        const NAME: &'static str = "penumbra.core.app.v1.QueryService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.core.app.v1.QueryService";
+    impl<T> tonic::server::NamedService for QueryServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.app.v1.serde.rs b/crates/proto/src/gen/penumbra.core.app.v1.serde.rs
index 9b910dd7fe..8f8c1b398e 100644
--- a/crates/proto/src/gen/penumbra.core.app.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.app.v1.serde.rs
@@ -479,6 +479,7 @@ impl serde::Serialize for GenesisAppState {
                 }
                 genesis_app_state::GenesisAppState::GenesisCheckpoint(v) => {
                     #[allow(clippy::needless_borrow)]
+                    #[allow(clippy::needless_borrows_for_generic_args)]
                     struct_ser.serialize_field("genesisCheckpoint", pbjson::private::base64::encode(&v).as_str())?;
                 }
             }
@@ -883,6 +884,7 @@ impl serde::Serialize for TransactionsByHeightRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.app.v1.TransactionsByHeightRequest", len)?;
         if self.block_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("blockHeight", ToString::to_string(&self.block_height).as_str())?;
         }
         struct_ser.end()
@@ -988,6 +990,7 @@ impl serde::Serialize for TransactionsByHeightResponse {
         }
         if self.block_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("blockHeight", ToString::to_string(&self.block_height).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.core.asset.v1.rs b/crates/proto/src/gen/penumbra.core.asset.v1.rs
index 7865016a58..737329422a 100644
--- a/crates/proto/src/gen/penumbra.core.asset.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.asset.v1.rs
@@ -1,4 +1,4 @@
-#[allow(clippy::derive_partial_eq_without_eq)]
+// This file is @generated by prost-build.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BalanceCommitment {
     #[prost(bytes = "vec", tag = "1")]
@@ -8,11 +8,13 @@ impl ::prost::Name for BalanceCommitment {
     const NAME: &'static str = "BalanceCommitment";
     const PACKAGE: &'static str = "penumbra.core.asset.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.asset.v1.{}", Self::NAME)
+        "penumbra.core.asset.v1.BalanceCommitment".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.asset.v1.BalanceCommitment".into()
     }
 }
 /// A Penumbra asset ID.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AssetId {
     /// The bytes of the asset ID.
@@ -40,10 +42,12 @@ impl ::prost::Name for AssetId {
     const NAME: &'static str = "AssetId";
     const PACKAGE: &'static str = "penumbra.core.asset.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.asset.v1.{}", Self::NAME)
+        "penumbra.core.asset.v1.AssetId".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.asset.v1.AssetId".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Denom {
     #[prost(string, tag = "1")]
@@ -53,11 +57,13 @@ impl ::prost::Name for Denom {
     const NAME: &'static str = "Denom";
     const PACKAGE: &'static str = "penumbra.core.asset.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.asset.v1.{}", Self::NAME)
+        "penumbra.core.asset.v1.Denom".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.asset.v1.Denom".into()
     }
 }
 /// Describes metadata about a given asset.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Metadata {
     #[prost(string, tag = "1")]
@@ -98,11 +104,13 @@ impl ::prost::Name for Metadata {
     const NAME: &'static str = "Metadata";
     const PACKAGE: &'static str = "penumbra.core.asset.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.asset.v1.{}", Self::NAME)
+        "penumbra.core.asset.v1.Metadata".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.asset.v1.Metadata".into()
     }
 }
 /// DenomUnit represents a struct that describes a given denomination unit of the basic token.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DenomUnit {
     /// denom represents the string name of the given denom unit (e.g uatom).
@@ -123,10 +131,12 @@ impl ::prost::Name for DenomUnit {
     const NAME: &'static str = "DenomUnit";
     const PACKAGE: &'static str = "penumbra.core.asset.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.asset.v1.{}", Self::NAME)
+        "penumbra.core.asset.v1.DenomUnit".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.asset.v1.DenomUnit".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Value {
     #[prost(message, optional, tag = "1")]
@@ -138,10 +148,12 @@ impl ::prost::Name for Value {
     const NAME: &'static str = "Value";
     const PACKAGE: &'static str = "penumbra.core.asset.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.asset.v1.{}", Self::NAME)
+        "penumbra.core.asset.v1.Value".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.asset.v1.Value".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Balance {
     /// Represents the vector of 'Value's in the balance.
@@ -150,7 +162,6 @@ pub struct Balance {
 }
 /// Nested message and enum types in `Balance`.
 pub mod balance {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct SignedValue {
         #[prost(message, optional, tag = "1")]
@@ -162,7 +173,10 @@ pub mod balance {
         const NAME: &'static str = "SignedValue";
         const PACKAGE: &'static str = "penumbra.core.asset.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!("penumbra.core.asset.v1.Balance.{}", Self::NAME)
+            "penumbra.core.asset.v1.Balance.SignedValue".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.asset.v1.Balance.SignedValue".into()
         }
     }
 }
@@ -170,11 +184,13 @@ impl ::prost::Name for Balance {
     const NAME: &'static str = "Balance";
     const PACKAGE: &'static str = "penumbra.core.asset.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.asset.v1.{}", Self::NAME)
+        "penumbra.core.asset.v1.Balance".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.asset.v1.Balance".into()
     }
 }
 /// Represents a value of a known or unknown denomination.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValueView {
     #[prost(oneof = "value_view::ValueView", tags = "1, 2")]
@@ -183,7 +199,6 @@ pub struct ValueView {
 /// Nested message and enum types in `ValueView`.
 pub mod value_view {
     /// A value whose asset ID is known and has metadata.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct KnownAssetId {
         /// The amount of the value.
@@ -211,11 +226,13 @@ pub mod value_view {
         const NAME: &'static str = "KnownAssetId";
         const PACKAGE: &'static str = "penumbra.core.asset.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!("penumbra.core.asset.v1.ValueView.{}", Self::NAME)
+            "penumbra.core.asset.v1.ValueView.KnownAssetId".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.asset.v1.ValueView.KnownAssetId".into()
         }
     }
     /// A value whose asset ID is unknown, with no metadata.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct UnknownAssetId {
         #[prost(message, optional, tag = "1")]
@@ -227,10 +244,12 @@ pub mod value_view {
         const NAME: &'static str = "UnknownAssetId";
         const PACKAGE: &'static str = "penumbra.core.asset.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!("penumbra.core.asset.v1.ValueView.{}", Self::NAME)
+            "penumbra.core.asset.v1.ValueView.UnknownAssetId".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.asset.v1.ValueView.UnknownAssetId".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum ValueView {
         #[prost(message, tag = "1")]
@@ -243,11 +262,13 @@ impl ::prost::Name for ValueView {
     const NAME: &'static str = "ValueView";
     const PACKAGE: &'static str = "penumbra.core.asset.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.asset.v1.{}", Self::NAME)
+        "penumbra.core.asset.v1.ValueView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.asset.v1.ValueView".into()
     }
 }
 /// An image related to an asset.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AssetImage {
     /// The URI of the image in PNG format.
@@ -261,7 +282,6 @@ pub struct AssetImage {
 }
 /// Nested message and enum types in `AssetImage`.
 pub mod asset_image {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Theme {
         /// Should be in hex format, `^#\[0-9a-fA-F\]{6}$`.
@@ -276,7 +296,10 @@ pub mod asset_image {
         const NAME: &'static str = "Theme";
         const PACKAGE: &'static str = "penumbra.core.asset.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!("penumbra.core.asset.v1.AssetImage.{}", Self::NAME)
+            "penumbra.core.asset.v1.AssetImage.Theme".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.asset.v1.AssetImage.Theme".into()
         }
     }
 }
@@ -284,13 +307,15 @@ impl ::prost::Name for AssetImage {
     const NAME: &'static str = "AssetImage";
     const PACKAGE: &'static str = "penumbra.core.asset.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.asset.v1.{}", Self::NAME)
+        "penumbra.core.asset.v1.AssetImage".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.asset.v1.AssetImage".into()
     }
 }
 /// The estimated price of one asset in terms of a numeraire.
 ///
 /// This is used for generating "equivalent values" in ValueViews.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EstimatedPrice {
     #[prost(message, optional, tag = "1")]
@@ -310,7 +335,10 @@ impl ::prost::Name for EstimatedPrice {
     const NAME: &'static str = "EstimatedPrice";
     const PACKAGE: &'static str = "penumbra.core.asset.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.asset.v1.{}", Self::NAME)
+        "penumbra.core.asset.v1.EstimatedPrice".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.asset.v1.EstimatedPrice".into()
     }
 }
 /// An "equivalent" value to a given value, in terms of a numeraire.
@@ -319,7 +347,6 @@ impl ::prost::Name for EstimatedPrice {
 /// stablecoin, or an amount of the staking token, etc.  A view server can
 /// optionally include this information to assist a frontend in displaying
 /// information about the value in a user-friendly way.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EquivalentValue {
     /// The equivalent amount of the parent Value in terms of the numeraire.
@@ -336,6 +363,9 @@ impl ::prost::Name for EquivalentValue {
     const NAME: &'static str = "EquivalentValue";
     const PACKAGE: &'static str = "penumbra.core.asset.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.asset.v1.{}", Self::NAME)
+        "penumbra.core.asset.v1.EquivalentValue".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.asset.v1.EquivalentValue".into()
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.asset.v1.serde.rs b/crates/proto/src/gen/penumbra.core.asset.v1.serde.rs
index d760c768a6..e0233c0b07 100644
--- a/crates/proto/src/gen/penumbra.core.asset.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.asset.v1.serde.rs
@@ -18,6 +18,7 @@ impl serde::Serialize for AssetId {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.asset.v1.AssetId", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         if !self.alt_bech32m.is_empty() {
@@ -613,6 +614,7 @@ impl serde::Serialize for BalanceCommitment {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.asset.v1.BalanceCommitment", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -949,6 +951,7 @@ impl serde::Serialize for EquivalentValue {
         }
         if self.as_of_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("asOfHeight", ToString::to_string(&self.as_of_height).as_str())?;
         }
         struct_ser.end()
@@ -1089,6 +1092,7 @@ impl serde::Serialize for EstimatedPrice {
         }
         if self.as_of_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("asOfHeight", ToString::to_string(&self.as_of_height).as_str())?;
         }
         struct_ser.end()
@@ -1276,6 +1280,7 @@ impl serde::Serialize for Metadata {
         }
         if self.priority_score != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("priorityScore", ToString::to_string(&self.priority_score).as_str())?;
         }
         if !self.badges.is_empty() {
diff --git a/crates/proto/src/gen/penumbra.core.component.auction.v1.rs b/crates/proto/src/gen/penumbra.core.component.auction.v1.rs
index e490a73599..b3655eaf63 100644
--- a/crates/proto/src/gen/penumbra.core.component.auction.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.component.auction.v1.rs
@@ -1,17 +1,19 @@
+// This file is @generated by prost-build.
 /// The configuration parameters for the auction component.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct AuctionParameters {}
 impl ::prost::Name for AuctionParameters {
     const NAME: &'static str = "AuctionParameters";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.AuctionParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.AuctionParameters".into()
     }
 }
 /// Genesis data for the auction component.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct GenesisContent {
     /// The configuration parameters for the auction component at genesis.
     #[prost(message, optional, tag = "1")]
@@ -21,10 +23,12 @@ impl ::prost::Name for GenesisContent {
     const NAME: &'static str = "GenesisContent";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.GenesisContent".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.GenesisContent".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuctionStateByIdRequest {
     #[prost(message, optional, tag = "1")]
@@ -34,10 +38,12 @@ impl ::prost::Name for AuctionStateByIdRequest {
     const NAME: &'static str = "AuctionStateByIdRequest";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.AuctionStateByIdRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.AuctionStateByIdRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuctionStateByIdResponse {
     /// If present, the state of the auction. If not present, no such auction is known.
@@ -53,10 +59,12 @@ impl ::prost::Name for AuctionStateByIdResponse {
     const NAME: &'static str = "AuctionStateByIdResponse";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.AuctionStateByIdResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.AuctionStateByIdResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuctionStateByIdsRequest {
     /// The auction IDs to request. Only known IDs will be returned in the response.
@@ -67,10 +75,12 @@ impl ::prost::Name for AuctionStateByIdsRequest {
     const NAME: &'static str = "AuctionStateByIdsRequest";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.AuctionStateByIdsRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.AuctionStateByIdsRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuctionStateByIdsResponse {
     /// The auction ID of the returned auction.
@@ -89,12 +99,14 @@ impl ::prost::Name for AuctionStateByIdsResponse {
     const NAME: &'static str = "AuctionStateByIdsResponse";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.AuctionStateByIdsResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.AuctionStateByIdsResponse".into()
     }
 }
 /// A unique identifier for an auction, obtained from hashing a domain separator
 /// along with the immutable part of an auction description.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuctionId {
     #[prost(bytes = "vec", tag = "1")]
@@ -104,11 +116,13 @@ impl ::prost::Name for AuctionId {
     const NAME: &'static str = "AuctionId";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.AuctionId".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.AuctionId".into()
     }
 }
 /// A bearer NFT tracking ownership of an auction and its proceeds.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuctionNft {
     #[prost(message, optional, tag = "1")]
@@ -120,11 +134,13 @@ impl ::prost::Name for AuctionNft {
     const NAME: &'static str = "AuctionNft";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.AuctionNft".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.AuctionNft".into()
     }
 }
 /// Describes a Dutch auction using programmatic liquidity on the DEX.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DutchAuctionDescription {
     /// The value the seller wishes to auction.
@@ -168,10 +184,12 @@ impl ::prost::Name for DutchAuctionDescription {
     const NAME: &'static str = "DutchAuctionDescription";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.DutchAuctionDescription".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.DutchAuctionDescription".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DutchAuctionState {
     /// The sequence number of the auction state.
@@ -203,10 +221,12 @@ impl ::prost::Name for DutchAuctionState {
     const NAME: &'static str = "DutchAuctionState";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.DutchAuctionState".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.DutchAuctionState".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DutchAuction {
     /// The immutable data describing the auction and its auction ID.
@@ -220,11 +240,13 @@ impl ::prost::Name for DutchAuction {
     const NAME: &'static str = "DutchAuction";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.DutchAuction".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.DutchAuction".into()
     }
 }
 /// Initiates a Dutch auction using protocol-controlled liquidity.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ActionDutchAuctionSchedule {
     #[prost(message, optional, tag = "1")]
@@ -234,11 +256,13 @@ impl ::prost::Name for ActionDutchAuctionSchedule {
     const NAME: &'static str = "ActionDutchAuctionSchedule";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.ActionDutchAuctionSchedule".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.ActionDutchAuctionSchedule".into()
     }
 }
 /// Terminate the auction associated with the specified `auction_id`
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ActionDutchAuctionEnd {
     /// The auction to end.
@@ -249,11 +273,13 @@ impl ::prost::Name for ActionDutchAuctionEnd {
     const NAME: &'static str = "ActionDutchAuctionEnd";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.ActionDutchAuctionEnd".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.ActionDutchAuctionEnd".into()
     }
 }
 /// Withdraw funds from the ended auction associated with the specified `auction_id`
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ActionDutchAuctionWithdraw {
     /// The auction to withdraw funds from.
@@ -276,11 +302,13 @@ impl ::prost::Name for ActionDutchAuctionWithdraw {
     const NAME: &'static str = "ActionDutchAuctionWithdraw";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.ActionDutchAuctionWithdraw".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.ActionDutchAuctionWithdraw".into()
     }
 }
 /// A plan to a `ActionDutchAuctionWithdraw` which contains both private and public data.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ActionDutchAuctionWithdrawPlan {
     #[prost(message, optional, tag = "1")]
@@ -296,11 +324,13 @@ impl ::prost::Name for ActionDutchAuctionWithdrawPlan {
     const NAME: &'static str = "ActionDutchAuctionWithdrawPlan";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.ActionDutchAuctionWithdrawPlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.ActionDutchAuctionWithdrawPlan".into()
     }
 }
 /// An `ActionDutchAuctionSchedule` augmented with additional metadata.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ActionDutchAuctionScheduleView {
     #[prost(message, optional, tag = "1")]
@@ -318,11 +348,13 @@ impl ::prost::Name for ActionDutchAuctionScheduleView {
     const NAME: &'static str = "ActionDutchAuctionScheduleView";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.ActionDutchAuctionScheduleView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.ActionDutchAuctionScheduleView".into()
     }
 }
 /// An `ActionDutchAuctionWithdraw` augmented with additional metadata.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ActionDutchAuctionWithdrawView {
     #[prost(message, optional, tag = "1")]
@@ -336,10 +368,12 @@ impl ::prost::Name for ActionDutchAuctionWithdrawView {
     const NAME: &'static str = "ActionDutchAuctionWithdrawView";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.ActionDutchAuctionWithdrawView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.ActionDutchAuctionWithdrawView".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventDutchAuctionScheduled {
     #[prost(message, optional, tag = "1")]
@@ -351,10 +385,12 @@ impl ::prost::Name for EventDutchAuctionScheduled {
     const NAME: &'static str = "EventDutchAuctionScheduled";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.EventDutchAuctionScheduled".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.EventDutchAuctionScheduled".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventDutchAuctionUpdated {
     #[prost(message, optional, tag = "1")]
@@ -366,10 +402,12 @@ impl ::prost::Name for EventDutchAuctionUpdated {
     const NAME: &'static str = "EventDutchAuctionUpdated";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.EventDutchAuctionUpdated".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.EventDutchAuctionUpdated".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventDutchAuctionEnded {
     #[prost(message, optional, tag = "1")]
@@ -410,10 +448,10 @@ pub mod event_dutch_auction_ended {
         /// (if the ProtoBuf definition does not change) and safe for programmatic use.
         pub fn as_str_name(&self) -> &'static str {
             match self {
-                Reason::Unspecified => "REASON_UNSPECIFIED",
-                Reason::Expired => "REASON_EXPIRED",
-                Reason::Filled => "REASON_FILLED",
-                Reason::ClosedByOwner => "REASON_CLOSED_BY_OWNER",
+                Self::Unspecified => "REASON_UNSPECIFIED",
+                Self::Expired => "REASON_EXPIRED",
+                Self::Filled => "REASON_FILLED",
+                Self::ClosedByOwner => "REASON_CLOSED_BY_OWNER",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.
@@ -432,10 +470,12 @@ impl ::prost::Name for EventDutchAuctionEnded {
     const NAME: &'static str = "EventDutchAuctionEnded";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.EventDutchAuctionEnded".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.EventDutchAuctionEnded".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventDutchAuctionWithdrawn {
     #[prost(message, optional, tag = "1")]
@@ -447,11 +487,13 @@ impl ::prost::Name for EventDutchAuctionWithdrawn {
     const NAME: &'static str = "EventDutchAuctionWithdrawn";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.EventDutchAuctionWithdrawn".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.EventDutchAuctionWithdrawn".into()
     }
 }
 /// A message emitted when value flows *into* the auction component.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventValueCircuitBreakerCredit {
     /// The asset ID being deposited into the Auction component.
@@ -468,11 +510,13 @@ impl ::prost::Name for EventValueCircuitBreakerCredit {
     const NAME: &'static str = "EventValueCircuitBreakerCredit";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.EventValueCircuitBreakerCredit".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.EventValueCircuitBreakerCredit".into()
     }
 }
 /// A message emitted when value flows *out* of the auction component.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventValueCircuitBreakerDebit {
     /// The asset ID being deposited into the Auction component.
@@ -489,13 +533,22 @@ impl ::prost::Name for EventValueCircuitBreakerDebit {
     const NAME: &'static str = "EventValueCircuitBreakerDebit";
     const PACKAGE: &'static str = "penumbra.core.component.auction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME)
+        "penumbra.core.component.auction.v1.EventValueCircuitBreakerDebit".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.auction.v1.EventValueCircuitBreakerDebit".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query operations for the auction component.
@@ -518,8 +571,8 @@ pub mod query_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -544,7 +597,7 @@ pub mod query_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -591,8 +644,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -622,8 +674,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -646,11 +697,17 @@ pub mod query_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServiceServer.
     #[async_trait]
-    pub trait QueryService: Send + Sync + 'static {
+    pub trait QueryService: std::marker::Send + std::marker::Sync + 'static {
         /// Get the current state of an auction by ID.
         async fn auction_state_by_id(
             &self,
@@ -666,7 +723,7 @@ pub mod query_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Get the current state of a group of auctions by ID.
         async fn auction_state_by_ids(
@@ -679,20 +736,18 @@ pub mod query_service_server {
     }
     /// Query operations for the auction component.
     #[derive(Debug)]
-    pub struct QueryServiceServer<T: QueryService> {
-        inner: _Inner<T>,
+    pub struct QueryServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: QueryService> QueryServiceServer<T> {
+    impl<T> QueryServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -742,8 +797,8 @@ pub mod query_service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServiceServer<T>
     where
         T: QueryService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -755,7 +810,6 @@ pub mod query_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.core.component.auction.v1.QueryService/AuctionStateById" => {
                     #[allow(non_camel_case_types)]
@@ -787,7 +841,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AuctionStateByIdSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -836,7 +889,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AuctionStateByIdsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -855,20 +907,25 @@ pub mod query_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: QueryService> Clone for QueryServiceServer<T> {
+    impl<T> Clone for QueryServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -880,17 +937,9 @@ pub mod query_service_server {
             }
         }
     }
-    impl<T: QueryService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: QueryService> tonic::server::NamedService for QueryServiceServer<T> {
-        const NAME: &'static str = "penumbra.core.component.auction.v1.QueryService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.core.component.auction.v1.QueryService";
+    impl<T> tonic::server::NamedService for QueryServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.component.auction.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.auction.v1.serde.rs
index d9fa61ccf8..56aae8af10 100644
--- a/crates/proto/src/gen/penumbra.core.component.auction.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.component.auction.v1.serde.rs
@@ -361,6 +361,7 @@ impl serde::Serialize for ActionDutchAuctionWithdraw {
         }
         if self.seq != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("seq", ToString::to_string(&self.seq).as_str())?;
         }
         if let Some(v) = self.reserves_commitment.as_ref() {
@@ -498,6 +499,7 @@ impl serde::Serialize for ActionDutchAuctionWithdrawPlan {
         }
         if self.seq != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("seq", ToString::to_string(&self.seq).as_str())?;
         }
         if let Some(v) = self.reserves_input.as_ref() {
@@ -750,6 +752,7 @@ impl serde::Serialize for AuctionId {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.AuctionId", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -854,6 +857,7 @@ impl serde::Serialize for AuctionNft {
         }
         if self.seq != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("seq", ToString::to_string(&self.seq).as_str())?;
         }
         struct_ser.end()
@@ -1611,18 +1615,22 @@ impl serde::Serialize for DutchAuctionDescription {
         }
         if self.start_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startHeight", ToString::to_string(&self.start_height).as_str())?;
         }
         if self.end_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("endHeight", ToString::to_string(&self.end_height).as_str())?;
         }
         if self.step_count != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("stepCount", ToString::to_string(&self.step_count).as_str())?;
         }
         if !self.nonce.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("nonce", pbjson::private::base64::encode(&self.nonce).as_str())?;
         }
         struct_ser.end()
@@ -1822,6 +1830,7 @@ impl serde::Serialize for DutchAuctionState {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.DutchAuctionState", len)?;
         if self.seq != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("seq", ToString::to_string(&self.seq).as_str())?;
         }
         if let Some(v) = self.current_position.as_ref() {
@@ -1829,6 +1838,7 @@ impl serde::Serialize for DutchAuctionState {
         }
         if self.next_trigger != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("nextTrigger", ToString::to_string(&self.next_trigger).as_str())?;
         }
         if let Some(v) = self.input_reserves.as_ref() {
diff --git a/crates/proto/src/gen/penumbra.core.component.community_pool.v1.rs b/crates/proto/src/gen/penumbra.core.component.community_pool.v1.rs
index 98e2df1748..aa173ad4d0 100644
--- a/crates/proto/src/gen/penumbra.core.component.community_pool.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.component.community_pool.v1.rs
@@ -1,6 +1,6 @@
+// This file is @generated by prost-build.
 /// CommunityPool parameter data.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct CommunityPoolParameters {
     /// Whether Community Pool spend proposals are enabled.
     #[prost(bool, tag = "1")]
@@ -10,13 +10,13 @@ impl ::prost::Name for CommunityPoolParameters {
     const NAME: &'static str = "CommunityPoolParameters";
     const PACKAGE: &'static str = "penumbra.core.component.community_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.community_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.community_pool.v1.CommunityPoolParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.community_pool.v1.CommunityPoolParameters".into()
     }
 }
 /// CommunityPool genesis state.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GenesisContent {
     /// CommunityPool parameters.
@@ -30,13 +30,13 @@ impl ::prost::Name for GenesisContent {
     const NAME: &'static str = "GenesisContent";
     const PACKAGE: &'static str = "penumbra.core.component.community_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.community_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.community_pool.v1.GenesisContent".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.community_pool.v1.GenesisContent".into()
     }
 }
 /// Requests the list of all asset balances associated with the Community Pool.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CommunityPoolAssetBalancesRequest {
     /// (Optional): The specific asset balances to retrieve, if excluded all will be returned.
@@ -47,13 +47,15 @@ impl ::prost::Name for CommunityPoolAssetBalancesRequest {
     const NAME: &'static str = "CommunityPoolAssetBalancesRequest";
     const PACKAGE: &'static str = "penumbra.core.component.community_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.community_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.community_pool.v1.CommunityPoolAssetBalancesRequest"
+            .into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.community_pool.v1.CommunityPoolAssetBalancesRequest"
+            .into()
     }
 }
 /// The Community Pool's balance of a single asset.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CommunityPoolAssetBalancesResponse {
     /// The balance for a single asset.
@@ -64,15 +66,24 @@ impl ::prost::Name for CommunityPoolAssetBalancesResponse {
     const NAME: &'static str = "CommunityPoolAssetBalancesResponse";
     const PACKAGE: &'static str = "penumbra.core.component.community_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.community_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.community_pool.v1.CommunityPoolAssetBalancesResponse"
+            .into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.community_pool.v1.CommunityPoolAssetBalancesResponse"
+            .into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query operations for the community_pool component.
@@ -95,8 +106,8 @@ pub mod query_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -121,7 +132,7 @@ pub mod query_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -169,8 +180,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -193,11 +203,17 @@ pub mod query_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServiceServer.
     #[async_trait]
-    pub trait QueryService: Send + Sync + 'static {
+    pub trait QueryService: std::marker::Send + std::marker::Sync + 'static {
         /// Server streaming response type for the CommunityPoolAssetBalances method.
         type CommunityPoolAssetBalancesStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<
@@ -205,7 +221,7 @@ pub mod query_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         async fn community_pool_asset_balances(
             &self,
@@ -217,20 +233,18 @@ pub mod query_service_server {
     }
     /// Query operations for the community_pool component.
     #[derive(Debug)]
-    pub struct QueryServiceServer<T: QueryService> {
-        inner: _Inner<T>,
+    pub struct QueryServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: QueryService> QueryServiceServer<T> {
+    impl<T> QueryServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -280,8 +294,8 @@ pub mod query_service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServiceServer<T>
     where
         T: QueryService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -293,7 +307,6 @@ pub mod query_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.core.component.community_pool.v1.QueryService/CommunityPoolAssetBalances" => {
                     #[allow(non_camel_case_types)]
@@ -332,7 +345,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = CommunityPoolAssetBalancesSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -351,20 +363,25 @@ pub mod query_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: QueryService> Clone for QueryServiceServer<T> {
+    impl<T> Clone for QueryServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -376,17 +393,9 @@ pub mod query_service_server {
             }
         }
     }
-    impl<T: QueryService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: QueryService> tonic::server::NamedService for QueryServiceServer<T> {
-        const NAME: &'static str = "penumbra.core.component.community_pool.v1.QueryService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.core.component.community_pool.v1.QueryService";
+    impl<T> tonic::server::NamedService for QueryServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.component.compact_block.v1.rs b/crates/proto/src/gen/penumbra.core.component.compact_block.v1.rs
index 08d2c5abf6..4c637af38c 100644
--- a/crates/proto/src/gen/penumbra.core.component.compact_block.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.component.compact_block.v1.rs
@@ -1,5 +1,5 @@
+// This file is @generated by prost-build.
 /// Contains the minimum data needed to update client state.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CompactBlock {
     #[prost(uint64, tag = "1")]
@@ -50,13 +50,13 @@ impl ::prost::Name for CompactBlock {
     const NAME: &'static str = "CompactBlock";
     const PACKAGE: &'static str = "penumbra.core.component.compact_block.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.compact_block.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.compact_block.v1.CompactBlock".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.compact_block.v1.CompactBlock".into()
     }
 }
 /// An encrypted payload, corresponding to a single commitment in the state commitment tree.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct StatePayload {
     /// The source of the payload, if known.
@@ -68,7 +68,6 @@ pub struct StatePayload {
 }
 /// Nested message and enum types in `StatePayload`.
 pub mod state_payload {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct RolledUp {
         #[prost(message, optional, tag = "1")]
@@ -80,12 +79,12 @@ pub mod state_payload {
         const NAME: &'static str = "RolledUp";
         const PACKAGE: &'static str = "penumbra.core.component.compact_block.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.compact_block.v1.StatePayload.{}", Self::NAME
-            )
+            "penumbra.core.component.compact_block.v1.StatePayload.RolledUp".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.compact_block.v1.StatePayload.RolledUp".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Note {
         #[prost(message, optional, tag = "2")]
@@ -97,12 +96,12 @@ pub mod state_payload {
         const NAME: &'static str = "Note";
         const PACKAGE: &'static str = "penumbra.core.component.compact_block.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.compact_block.v1.StatePayload.{}", Self::NAME
-            )
+            "penumbra.core.component.compact_block.v1.StatePayload.Note".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.compact_block.v1.StatePayload.Note".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Swap {
         #[prost(message, optional, tag = "2")]
@@ -112,13 +111,13 @@ pub mod state_payload {
         const NAME: &'static str = "Swap";
         const PACKAGE: &'static str = "penumbra.core.component.compact_block.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.compact_block.v1.StatePayload.{}", Self::NAME
-            )
+            "penumbra.core.component.compact_block.v1.StatePayload.Swap".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.compact_block.v1.StatePayload.Swap".into()
         }
     }
     /// The state payload itself.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum StatePayload {
         #[prost(message, tag = "2")]
@@ -133,14 +132,14 @@ impl ::prost::Name for StatePayload {
     const NAME: &'static str = "StatePayload";
     const PACKAGE: &'static str = "penumbra.core.component.compact_block.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.compact_block.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.compact_block.v1.StatePayload".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.compact_block.v1.StatePayload".into()
     }
 }
 /// Requests a range of compact block data.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct CompactBlockRangeRequest {
     /// The start height of the range.
     #[prost(uint64, tag = "2")]
@@ -157,12 +156,12 @@ impl ::prost::Name for CompactBlockRangeRequest {
     const NAME: &'static str = "CompactBlockRangeRequest";
     const PACKAGE: &'static str = "penumbra.core.component.compact_block.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.compact_block.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.compact_block.v1.CompactBlockRangeRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.compact_block.v1.CompactBlockRangeRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CompactBlockRangeResponse {
     #[prost(message, optional, tag = "1")]
@@ -172,13 +171,13 @@ impl ::prost::Name for CompactBlockRangeResponse {
     const NAME: &'static str = "CompactBlockRangeResponse";
     const PACKAGE: &'static str = "penumbra.core.component.compact_block.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.compact_block.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.compact_block.v1.CompactBlockRangeResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.compact_block.v1.CompactBlockRangeResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct CompactBlockRequest {
     #[prost(uint64, tag = "1")]
     pub height: u64,
@@ -187,12 +186,12 @@ impl ::prost::Name for CompactBlockRequest {
     const NAME: &'static str = "CompactBlockRequest";
     const PACKAGE: &'static str = "penumbra.core.component.compact_block.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.compact_block.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.compact_block.v1.CompactBlockRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.compact_block.v1.CompactBlockRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CompactBlockResponse {
     #[prost(message, optional, tag = "1")]
@@ -202,15 +201,22 @@ impl ::prost::Name for CompactBlockResponse {
     const NAME: &'static str = "CompactBlockResponse";
     const PACKAGE: &'static str = "penumbra.core.component.compact_block.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.compact_block.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.compact_block.v1.CompactBlockResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.compact_block.v1.CompactBlockResponse".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query operations for the compact block component.
@@ -233,8 +239,8 @@ pub mod query_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -259,7 +265,7 @@ pub mod query_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -306,8 +312,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -339,8 +344,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -363,11 +367,17 @@ pub mod query_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServiceServer.
     #[async_trait]
-    pub trait QueryService: Send + Sync + 'static {
+    pub trait QueryService: std::marker::Send + std::marker::Sync + 'static {
         /// Server streaming response type for the CompactBlockRange method.
         type CompactBlockRangeStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<
@@ -375,7 +385,7 @@ pub mod query_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Returns a stream of compact blocks, optionally keeping the stream alive for push notifications.
         async fn compact_block_range(
@@ -398,20 +408,18 @@ pub mod query_service_server {
     }
     /// Query operations for the compact block component.
     #[derive(Debug)]
-    pub struct QueryServiceServer<T: QueryService> {
-        inner: _Inner<T>,
+    pub struct QueryServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: QueryService> QueryServiceServer<T> {
+    impl<T> QueryServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -461,8 +469,8 @@ pub mod query_service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServiceServer<T>
     where
         T: QueryService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -474,7 +482,6 @@ pub mod query_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.core.component.compact_block.v1.QueryService/CompactBlockRange" => {
                     #[allow(non_camel_case_types)]
@@ -508,7 +515,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = CompactBlockRangeSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -554,7 +560,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = CompactBlockSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -573,20 +578,25 @@ pub mod query_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: QueryService> Clone for QueryServiceServer<T> {
+    impl<T> Clone for QueryServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -598,17 +608,9 @@ pub mod query_service_server {
             }
         }
     }
-    impl<T: QueryService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: QueryService> tonic::server::NamedService for QueryServiceServer<T> {
-        const NAME: &'static str = "penumbra.core.component.compact_block.v1.QueryService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.core.component.compact_block.v1.QueryService";
+    impl<T> tonic::server::NamedService for QueryServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.component.compact_block.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.compact_block.v1.serde.rs
index 0f4dee3282..70d2530169 100644
--- a/crates/proto/src/gen/penumbra.core.component.compact_block.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.component.compact_block.v1.serde.rs
@@ -45,6 +45,7 @@ impl serde::Serialize for CompactBlock {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.compact_block.v1.CompactBlock", len)?;
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         if !self.state_payloads.is_empty() {
@@ -79,6 +80,7 @@ impl serde::Serialize for CompactBlock {
         }
         if self.epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("epochIndex", ToString::to_string(&self.epoch_index).as_str())?;
         }
         struct_ser.end()
@@ -316,10 +318,12 @@ impl serde::Serialize for CompactBlockRangeRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.compact_block.v1.CompactBlockRangeRequest", len)?;
         if self.start_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startHeight", ToString::to_string(&self.start_height).as_str())?;
         }
         if self.end_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("endHeight", ToString::to_string(&self.end_height).as_str())?;
         }
         if self.keep_alive {
@@ -544,6 +548,7 @@ impl serde::Serialize for CompactBlockRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.compact_block.v1.CompactBlockRequest", len)?;
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.core.component.dex.v1.rs b/crates/proto/src/gen/penumbra.core.component.dex.v1.rs
index 3878535c9e..4b907234c2 100644
--- a/crates/proto/src/gen/penumbra.core.component.dex.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.component.dex.v1.rs
@@ -1,5 +1,5 @@
+// This file is @generated by prost-build.
 /// A Penumbra ZK swap proof.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ZkSwapProof {
     #[prost(bytes = "vec", tag = "1")]
@@ -9,11 +9,13 @@ impl ::prost::Name for ZkSwapProof {
     const NAME: &'static str = "ZKSwapProof";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.ZKSwapProof".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.ZKSwapProof".into()
     }
 }
 /// A Penumbra ZK swap claim proof.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ZkSwapClaimProof {
     #[prost(bytes = "vec", tag = "1")]
@@ -23,11 +25,13 @@ impl ::prost::Name for ZkSwapClaimProof {
     const NAME: &'static str = "ZKSwapClaimProof";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.ZKSwapClaimProof".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.ZKSwapClaimProof".into()
     }
 }
 /// A transaction action that submits a swap to the dex.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Swap {
     /// Contains the Swap proof.
@@ -41,14 +45,16 @@ impl ::prost::Name for Swap {
     const NAME: &'static str = "Swap";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.Swap".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.Swap".into()
     }
 }
 /// A transaction action that obtains assets previously confirmed
 /// via a Swap transaction. Does not include a spend authorization
 /// signature, as it is only capable of consuming the NFT from a
 /// Swap transaction.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapClaim {
     /// Contains the SwapClaim proof.
@@ -65,11 +71,13 @@ impl ::prost::Name for SwapClaim {
     const NAME: &'static str = "SwapClaim";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapClaim".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapClaim".into()
     }
 }
 /// Encapsulates the authorized fields of the SwapClaim action, used in signing.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapClaimBody {
     /// The nullifier for the Swap commitment to be consumed.
@@ -96,11 +104,13 @@ impl ::prost::Name for SwapClaimBody {
     const NAME: &'static str = "SwapClaimBody";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapClaimBody".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapClaimBody".into()
     }
 }
 /// The authorized data of a Swap transaction.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapBody {
     /// The trading pair to swap.
@@ -128,10 +138,12 @@ impl ::prost::Name for SwapBody {
     const NAME: &'static str = "SwapBody";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapBody".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapBody".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapPayload {
     #[prost(message, optional, tag = "1")]
@@ -145,10 +157,12 @@ impl ::prost::Name for SwapPayload {
     const NAME: &'static str = "SwapPayload";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapPayload".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapPayload".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapPlaintext {
     /// The trading pair to swap.
@@ -174,10 +188,12 @@ impl ::prost::Name for SwapPlaintext {
     const NAME: &'static str = "SwapPlaintext";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapPlaintext".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapPlaintext".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapPlan {
     /// The plaintext version of the swap to be performed.
@@ -197,10 +213,12 @@ impl ::prost::Name for SwapPlan {
     const NAME: &'static str = "SwapPlan";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapPlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapPlan".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapClaimPlan {
     /// The plaintext version of the swap to be performed.
@@ -226,10 +244,12 @@ impl ::prost::Name for SwapClaimPlan {
     const NAME: &'static str = "SwapClaimPlan";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapClaimPlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapClaimPlan".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapView {
     #[prost(oneof = "swap_view::SwapView", tags = "1, 2")]
@@ -237,7 +257,6 @@ pub struct SwapView {
 }
 /// Nested message and enum types in `SwapView`.
 pub mod swap_view {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Visible {
         /// The underlying Swap action being viewed.
@@ -295,12 +314,12 @@ pub mod swap_view {
         const NAME: &'static str = "Visible";
         const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.dex.v1.SwapView.{}", Self::NAME
-            )
+            "penumbra.core.component.dex.v1.SwapView.Visible".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.dex.v1.SwapView.Visible".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Opaque {
         #[prost(message, optional, tag = "1")]
@@ -345,12 +364,12 @@ pub mod swap_view {
         const NAME: &'static str = "Opaque";
         const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.dex.v1.SwapView.{}", Self::NAME
-            )
+            "penumbra.core.component.dex.v1.SwapView.Opaque".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.dex.v1.SwapView.Opaque".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum SwapView {
         #[prost(message, tag = "1")]
@@ -363,10 +382,12 @@ impl ::prost::Name for SwapView {
     const NAME: &'static str = "SwapView";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapView".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapClaimView {
     #[prost(oneof = "swap_claim_view::SwapClaimView", tags = "1, 2")]
@@ -374,7 +395,6 @@ pub struct SwapClaimView {
 }
 /// Nested message and enum types in `SwapClaimView`.
 pub mod swap_claim_view {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Visible {
         #[prost(message, optional, tag = "1")]
@@ -401,12 +421,12 @@ pub mod swap_claim_view {
         const NAME: &'static str = "Visible";
         const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.dex.v1.SwapClaimView.{}", Self::NAME
-            )
+            "penumbra.core.component.dex.v1.SwapClaimView.Visible".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.dex.v1.SwapClaimView.Visible".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Opaque {
         #[prost(message, optional, tag = "1")]
@@ -416,12 +436,12 @@ pub mod swap_claim_view {
         const NAME: &'static str = "Opaque";
         const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.dex.v1.SwapClaimView.{}", Self::NAME
-            )
+            "penumbra.core.component.dex.v1.SwapClaimView.Opaque".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.dex.v1.SwapClaimView.Opaque".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum SwapClaimView {
         #[prost(message, tag = "1")]
@@ -434,13 +454,15 @@ impl ::prost::Name for SwapClaimView {
     const NAME: &'static str = "SwapClaimView";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapClaimView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapClaimView".into()
     }
 }
 /// Holds two asset IDs. Ordering doesn't reflect trading direction. Instead, we
 /// require `asset_1 < asset_2` as field elements, to ensure a canonical
 /// representation of an unordered pair.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TradingPair {
     /// The first asset of the pair.
@@ -454,12 +476,14 @@ impl ::prost::Name for TradingPair {
     const NAME: &'static str = "TradingPair";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.TradingPair".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.TradingPair".into()
     }
 }
 /// Encodes a trading pair starting from asset `start`
 /// and ending on asset `end`.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DirectedTradingPair {
     /// The start asset of the pair.
@@ -473,14 +497,16 @@ impl ::prost::Name for DirectedTradingPair {
     const NAME: &'static str = "DirectedTradingPair";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.DirectedTradingPair".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.DirectedTradingPair".into()
     }
 }
 /// Records the result of a batch swap on-chain.
 ///
 /// Used as a public input to a swap claim proof, as it implies the effective
 /// clearing price for the batch.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BatchSwapOutputData {
     /// The total amount of asset 1 that was input to the batch swap.
@@ -519,14 +545,16 @@ impl ::prost::Name for BatchSwapOutputData {
     const NAME: &'static str = "BatchSwapOutputData";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.BatchSwapOutputData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.BatchSwapOutputData".into()
     }
 }
 /// The trading function for a specific pair.
 /// For a pair (asset_1, asset_2), a trading function is defined by:
 /// `phi(R) = p*R_1 + q*R_2` and `gamma = 1 - fee`.
 /// The trading function is frequently referred to as "phi".
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TradingFunction {
     #[prost(message, optional, tag = "1")]
@@ -538,7 +566,10 @@ impl ::prost::Name for TradingFunction {
     const NAME: &'static str = "TradingFunction";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.TradingFunction".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.TradingFunction".into()
     }
 }
 /// The minimum amount of data describing a trading function.
@@ -546,8 +577,7 @@ impl ::prost::Name for TradingFunction {
 /// This implicitly treats the trading function as being between assets 1 and 2,
 /// without specifying what those assets are, to avoid duplicating data (each
 /// asset ID alone is twice the size of the trading function).
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct BareTradingFunction {
     #[prost(uint32, tag = "1")]
     pub fee: u32,
@@ -562,7 +592,10 @@ impl ::prost::Name for BareTradingFunction {
     const NAME: &'static str = "BareTradingFunction";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.BareTradingFunction".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.BareTradingFunction".into()
     }
 }
 /// The reserves of a position.
@@ -571,8 +604,7 @@ impl ::prost::Name for BareTradingFunction {
 /// between assets 1 and 2, without specifying what those assets are, to avoid
 /// duplicating data (each asset ID alone is four times the size of the
 /// reserves).
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct Reserves {
     #[prost(message, optional, tag = "1")]
     pub r1: ::core::option::Option<super::super::super::num::v1::Amount>,
@@ -583,11 +615,13 @@ impl ::prost::Name for Reserves {
     const NAME: &'static str = "Reserves";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.Reserves".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.Reserves".into()
     }
 }
 /// Data identifying a position.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Position {
     #[prost(message, optional, tag = "1")]
@@ -612,11 +646,13 @@ impl ::prost::Name for Position {
     const NAME: &'static str = "Position";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.Position".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.Position".into()
     }
 }
 /// A hash of a `Position`.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PositionId {
     /// The bytes of the position ID.
@@ -636,12 +672,14 @@ impl ::prost::Name for PositionId {
     const NAME: &'static str = "PositionId";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.PositionId".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.PositionId".into()
     }
 }
 /// The state of a position.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct PositionState {
     #[prost(enumeration = "position_state::PositionStateEnum", tag = "1")]
     pub state: i32,
@@ -689,11 +727,11 @@ pub mod position_state {
         /// (if the ProtoBuf definition does not change) and safe for programmatic use.
         pub fn as_str_name(&self) -> &'static str {
             match self {
-                PositionStateEnum::Unspecified => "POSITION_STATE_ENUM_UNSPECIFIED",
-                PositionStateEnum::Opened => "POSITION_STATE_ENUM_OPENED",
-                PositionStateEnum::Closed => "POSITION_STATE_ENUM_CLOSED",
-                PositionStateEnum::Withdrawn => "POSITION_STATE_ENUM_WITHDRAWN",
-                PositionStateEnum::Claimed => "POSITION_STATE_ENUM_CLAIMED",
+                Self::Unspecified => "POSITION_STATE_ENUM_UNSPECIFIED",
+                Self::Opened => "POSITION_STATE_ENUM_OPENED",
+                Self::Closed => "POSITION_STATE_ENUM_CLOSED",
+                Self::Withdrawn => "POSITION_STATE_ENUM_WITHDRAWN",
+                Self::Claimed => "POSITION_STATE_ENUM_CLAIMED",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.
@@ -713,7 +751,10 @@ impl ::prost::Name for PositionState {
     const NAME: &'static str = "PositionState";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.PositionState".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.PositionState".into()
     }
 }
 /// An LPNFT tracking both ownership and state of a position.
@@ -731,7 +772,6 @@ impl ::prost::Name for PositionState {
 /// require any cryptographic implementation (proofs, signatures, etc), other
 /// than hooking into the value commitment mechanism used for transaction
 /// balances.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct LpNft {
     #[prost(message, optional, tag = "1")]
@@ -743,14 +783,16 @@ impl ::prost::Name for LpNft {
     const NAME: &'static str = "LpNft";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.LpNft".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.LpNft".into()
     }
 }
 /// A transaction action that opens a new position.
 ///
 /// This action's contribution to the transaction's value balance is to consume
 /// the initial reserves and contribute an opened position NFT.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PositionOpen {
     /// Contains the data defining the position, sufficient to compute its `PositionId`.
@@ -764,7 +806,10 @@ impl ::prost::Name for PositionOpen {
     const NAME: &'static str = "PositionOpen";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.PositionOpen".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.PositionOpen".into()
     }
 }
 /// A transaction action that closes a position.
@@ -776,7 +821,6 @@ impl ::prost::Name for PositionOpen {
 /// transactions (like any ZK transaction model) are early-binding: the prover
 /// must know the state transition they prove knowledge of, and they cannot know
 /// the final reserves with certainty until after the position has been deactivated.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PositionClose {
     #[prost(message, optional, tag = "1")]
@@ -786,7 +830,10 @@ impl ::prost::Name for PositionClose {
     const NAME: &'static str = "PositionClose";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.PositionClose".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.PositionClose".into()
     }
 }
 /// A transaction action that withdraws funds from a closed position.
@@ -794,7 +841,6 @@ impl ::prost::Name for PositionClose {
 /// This action's contribution to the transaction's value balance is to consume a
 /// closed position NFT and contribute a withdrawn position NFT, as well as all
 /// of the funds that were in the position at the time of closing.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PositionWithdraw {
     #[prost(message, optional, tag = "1")]
@@ -816,11 +862,13 @@ impl ::prost::Name for PositionWithdraw {
     const NAME: &'static str = "PositionWithdraw";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.PositionWithdraw".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.PositionWithdraw".into()
     }
 }
 /// Deprecated.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PositionRewardClaim {
     #[prost(message, optional, tag = "1")]
@@ -834,11 +882,13 @@ impl ::prost::Name for PositionRewardClaim {
     const NAME: &'static str = "PositionRewardClaim";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.PositionRewardClaim".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.PositionRewardClaim".into()
     }
 }
 /// Contains the entire execution of a particular swap.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapExecution {
     #[prost(message, repeated, tag = "1")]
@@ -853,7 +903,6 @@ pub struct SwapExecution {
 /// Nested message and enum types in `SwapExecution`.
 pub mod swap_execution {
     /// Contains all individual steps consisting of a trade trace.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Trace {
         /// Each step in the trade trace.
@@ -866,9 +915,10 @@ pub mod swap_execution {
         const NAME: &'static str = "Trace";
         const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.dex.v1.SwapExecution.{}", Self::NAME
-            )
+            "penumbra.core.component.dex.v1.SwapExecution.Trace".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.dex.v1.SwapExecution.Trace".into()
         }
     }
 }
@@ -876,11 +926,13 @@ impl ::prost::Name for SwapExecution {
     const NAME: &'static str = "SwapExecution";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapExecution".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapExecution".into()
     }
 }
 /// Contains private and public data for withdrawing funds from a closed position.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PositionWithdrawPlan {
     #[prost(message, optional, tag = "1")]
@@ -900,12 +952,14 @@ impl ::prost::Name for PositionWithdrawPlan {
     const NAME: &'static str = "PositionWithdrawPlan";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.PositionWithdrawPlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.PositionWithdrawPlan".into()
     }
 }
 /// Deprecated.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct PositionRewardClaimPlan {
     #[prost(message, optional, tag = "1")]
     pub reserves: ::core::option::Option<Reserves>,
@@ -914,11 +968,13 @@ impl ::prost::Name for PositionRewardClaimPlan {
     const NAME: &'static str = "PositionRewardClaimPlan";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.PositionRewardClaimPlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.PositionRewardClaimPlan".into()
     }
 }
 /// Requests batch swap data associated with a given height and trading pair from the view service.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BatchSwapOutputDataRequest {
     #[prost(uint64, tag = "2")]
@@ -930,10 +986,12 @@ impl ::prost::Name for BatchSwapOutputDataRequest {
     const NAME: &'static str = "BatchSwapOutputDataRequest";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.BatchSwapOutputDataRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.BatchSwapOutputDataRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BatchSwapOutputDataResponse {
     #[prost(message, optional, tag = "1")]
@@ -943,10 +1001,12 @@ impl ::prost::Name for BatchSwapOutputDataResponse {
     const NAME: &'static str = "BatchSwapOutputDataResponse";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.BatchSwapOutputDataResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.BatchSwapOutputDataResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapExecutionRequest {
     #[prost(uint64, tag = "2")]
@@ -958,10 +1018,12 @@ impl ::prost::Name for SwapExecutionRequest {
     const NAME: &'static str = "SwapExecutionRequest";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapExecutionRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapExecutionRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapExecutionResponse {
     #[prost(message, optional, tag = "1")]
@@ -971,11 +1033,13 @@ impl ::prost::Name for SwapExecutionResponse {
     const NAME: &'static str = "SwapExecutionResponse";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapExecutionResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapExecutionResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ArbExecutionRequest {
     #[prost(uint64, tag = "2")]
     pub height: u64,
@@ -984,10 +1048,12 @@ impl ::prost::Name for ArbExecutionRequest {
     const NAME: &'static str = "ArbExecutionRequest";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.ArbExecutionRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.ArbExecutionRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ArbExecutionResponse {
     #[prost(message, optional, tag = "1")]
@@ -999,10 +1065,12 @@ impl ::prost::Name for ArbExecutionResponse {
     const NAME: &'static str = "ArbExecutionResponse";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.ArbExecutionResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.ArbExecutionResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapExecutionsRequest {
     /// If present, only return swap executions occurring after the given height.
@@ -1019,10 +1087,12 @@ impl ::prost::Name for SwapExecutionsRequest {
     const NAME: &'static str = "SwapExecutionsRequest";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapExecutionsRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapExecutionsRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapExecutionsResponse {
     #[prost(message, optional, tag = "1")]
@@ -1036,11 +1106,13 @@ impl ::prost::Name for SwapExecutionsResponse {
     const NAME: &'static str = "SwapExecutionsResponse";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SwapExecutionsResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SwapExecutionsResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ArbExecutionsRequest {
     /// If present, only return arb executions occurring after the given height.
     #[prost(uint64, tag = "2")]
@@ -1053,10 +1125,12 @@ impl ::prost::Name for ArbExecutionsRequest {
     const NAME: &'static str = "ArbExecutionsRequest";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.ArbExecutionsRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.ArbExecutionsRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ArbExecutionsResponse {
     #[prost(message, optional, tag = "1")]
@@ -1068,11 +1142,13 @@ impl ::prost::Name for ArbExecutionsResponse {
     const NAME: &'static str = "ArbExecutionsResponse";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.ArbExecutionsResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.ArbExecutionsResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct LiquidityPositionsRequest {
     /// If true, include closed and withdrawn positions.
     #[prost(bool, tag = "4")]
@@ -1082,10 +1158,12 @@ impl ::prost::Name for LiquidityPositionsRequest {
     const NAME: &'static str = "LiquidityPositionsRequest";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.LiquidityPositionsRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.LiquidityPositionsRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct LiquidityPositionsResponse {
     #[prost(message, optional, tag = "1")]
@@ -1095,10 +1173,12 @@ impl ::prost::Name for LiquidityPositionsResponse {
     const NAME: &'static str = "LiquidityPositionsResponse";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.LiquidityPositionsResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.LiquidityPositionsResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct LiquidityPositionByIdRequest {
     #[prost(message, optional, tag = "2")]
@@ -1108,10 +1188,12 @@ impl ::prost::Name for LiquidityPositionByIdRequest {
     const NAME: &'static str = "LiquidityPositionByIdRequest";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.LiquidityPositionByIdRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.LiquidityPositionByIdRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct LiquidityPositionByIdResponse {
     #[prost(message, optional, tag = "1")]
@@ -1121,10 +1203,12 @@ impl ::prost::Name for LiquidityPositionByIdResponse {
     const NAME: &'static str = "LiquidityPositionByIdResponse";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.LiquidityPositionByIdResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.LiquidityPositionByIdResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct LiquidityPositionsByIdRequest {
     #[prost(message, repeated, tag = "2")]
@@ -1134,10 +1218,12 @@ impl ::prost::Name for LiquidityPositionsByIdRequest {
     const NAME: &'static str = "LiquidityPositionsByIdRequest";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.LiquidityPositionsByIdRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.LiquidityPositionsByIdRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct LiquidityPositionsByIdResponse {
     #[prost(message, optional, tag = "1")]
@@ -1147,10 +1233,12 @@ impl ::prost::Name for LiquidityPositionsByIdResponse {
     const NAME: &'static str = "LiquidityPositionsByIdResponse";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.LiquidityPositionsByIdResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.LiquidityPositionsByIdResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct LiquidityPositionsByPriceRequest {
     /// The directed trading pair to request positions for
@@ -1164,10 +1252,12 @@ impl ::prost::Name for LiquidityPositionsByPriceRequest {
     const NAME: &'static str = "LiquidityPositionsByPriceRequest";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.LiquidityPositionsByPriceRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.LiquidityPositionsByPriceRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct LiquidityPositionsByPriceResponse {
     #[prost(message, optional, tag = "1")]
@@ -1179,10 +1269,12 @@ impl ::prost::Name for LiquidityPositionsByPriceResponse {
     const NAME: &'static str = "LiquidityPositionsByPriceResponse";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.LiquidityPositionsByPriceResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.LiquidityPositionsByPriceResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SpreadRequest {
     #[prost(message, optional, tag = "2")]
@@ -1192,10 +1284,12 @@ impl ::prost::Name for SpreadRequest {
     const NAME: &'static str = "SpreadRequest";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SpreadRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SpreadRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SpreadResponse {
     /// The best position when trading 1 => 2.
@@ -1215,10 +1309,12 @@ impl ::prost::Name for SpreadResponse {
     const NAME: &'static str = "SpreadResponse";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SpreadResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SpreadResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SimulateTradeRequest {
     #[prost(message, optional, tag = "1")]
@@ -1230,42 +1326,42 @@ pub struct SimulateTradeRequest {
 }
 /// Nested message and enum types in `SimulateTradeRequest`.
 pub mod simulate_trade_request {
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct Routing {
         #[prost(oneof = "routing::Setting", tags = "1, 2")]
         pub setting: ::core::option::Option<routing::Setting>,
     }
     /// Nested message and enum types in `Routing`.
     pub mod routing {
-        #[allow(clippy::derive_partial_eq_without_eq)]
-        #[derive(Clone, PartialEq, ::prost::Message)]
+        #[derive(Clone, Copy, PartialEq, ::prost::Message)]
         pub struct SingleHop {}
         impl ::prost::Name for SingleHop {
             const NAME: &'static str = "SingleHop";
             const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
             fn full_name() -> ::prost::alloc::string::String {
-                ::prost::alloc::format!(
-                    "penumbra.core.component.dex.v1.SimulateTradeRequest.Routing.{}",
-                    Self::NAME
-                )
+                "penumbra.core.component.dex.v1.SimulateTradeRequest.Routing.SingleHop"
+                    .into()
+            }
+            fn type_url() -> ::prost::alloc::string::String {
+                "/penumbra.core.component.dex.v1.SimulateTradeRequest.Routing.SingleHop"
+                    .into()
             }
         }
-        #[allow(clippy::derive_partial_eq_without_eq)]
-        #[derive(Clone, PartialEq, ::prost::Message)]
+        #[derive(Clone, Copy, PartialEq, ::prost::Message)]
         pub struct Default {}
         impl ::prost::Name for Default {
             const NAME: &'static str = "Default";
             const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
             fn full_name() -> ::prost::alloc::string::String {
-                ::prost::alloc::format!(
-                    "penumbra.core.component.dex.v1.SimulateTradeRequest.Routing.{}",
-                    Self::NAME
-                )
+                "penumbra.core.component.dex.v1.SimulateTradeRequest.Routing.Default"
+                    .into()
+            }
+            fn type_url() -> ::prost::alloc::string::String {
+                "/penumbra.core.component.dex.v1.SimulateTradeRequest.Routing.Default"
+                    .into()
             }
         }
-        #[allow(clippy::derive_partial_eq_without_eq)]
-        #[derive(Clone, PartialEq, ::prost::Oneof)]
+        #[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
         pub enum Setting {
             #[prost(message, tag = "1")]
             Default(Default),
@@ -1277,9 +1373,10 @@ pub mod simulate_trade_request {
         const NAME: &'static str = "Routing";
         const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.dex.v1.SimulateTradeRequest.{}", Self::NAME
-            )
+            "penumbra.core.component.dex.v1.SimulateTradeRequest.Routing".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.dex.v1.SimulateTradeRequest.Routing".into()
         }
     }
 }
@@ -1287,10 +1384,12 @@ impl ::prost::Name for SimulateTradeRequest {
     const NAME: &'static str = "SimulateTradeRequest";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SimulateTradeRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SimulateTradeRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SimulateTradeResponse {
     #[prost(message, optional, tag = "1")]
@@ -1303,10 +1402,12 @@ impl ::prost::Name for SimulateTradeResponse {
     const NAME: &'static str = "SimulateTradeResponse";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.SimulateTradeResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.SimulateTradeResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventSwap {
     /// The trading pair to swap.
@@ -1328,10 +1429,12 @@ impl ::prost::Name for EventSwap {
     const NAME: &'static str = "EventSwap";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.EventSwap".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.EventSwap".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventSwapClaim {
     /// The trading pair that is subject of the swap claim.
@@ -1355,10 +1458,12 @@ impl ::prost::Name for EventSwapClaim {
     const NAME: &'static str = "EventSwapClaim";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.EventSwapClaim".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.EventSwapClaim".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventPositionOpen {
     /// Position ID.
@@ -1387,10 +1492,12 @@ impl ::prost::Name for EventPositionOpen {
     const NAME: &'static str = "EventPositionOpen";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.EventPositionOpen".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.EventPositionOpen".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventPositionClose {
     /// The ID of the closed position
@@ -1401,10 +1508,12 @@ impl ::prost::Name for EventPositionClose {
     const NAME: &'static str = "EventPositionClose";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.EventPositionClose".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.EventPositionClose".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventQueuePositionClose {
     /// The ID of the position queued that is closed for closure.
@@ -1415,10 +1524,12 @@ impl ::prost::Name for EventQueuePositionClose {
     const NAME: &'static str = "EventQueuePositionClose";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.EventQueuePositionClose".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.EventQueuePositionClose".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventPositionWithdraw {
     /// The ID of the withdrawn position.
@@ -1441,10 +1552,12 @@ impl ::prost::Name for EventPositionWithdraw {
     const NAME: &'static str = "EventPositionWithdraw";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.EventPositionWithdraw".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.EventPositionWithdraw".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventPositionExecution {
     /// The ID of the position executed against.
@@ -1473,10 +1586,12 @@ impl ::prost::Name for EventPositionExecution {
     const NAME: &'static str = "EventPositionExecution";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.EventPositionExecution".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.EventPositionExecution".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventBatchSwap {
     /// The BatchSwapOutputData containing the results of the batch swap.
@@ -1493,10 +1608,12 @@ impl ::prost::Name for EventBatchSwap {
     const NAME: &'static str = "EventBatchSwap";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.EventBatchSwap".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.EventBatchSwap".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventArbExecution {
     /// The height at which the arb execution occurred.
@@ -1510,11 +1627,13 @@ impl ::prost::Name for EventArbExecution {
     const NAME: &'static str = "EventArbExecution";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.EventArbExecution".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.EventArbExecution".into()
     }
 }
 /// Indicates that value was added to the DEX.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventValueCircuitBreakerCredit {
     /// The asset ID being deposited into the DEX.
@@ -1531,11 +1650,13 @@ impl ::prost::Name for EventValueCircuitBreakerCredit {
     const NAME: &'static str = "EventValueCircuitBreakerCredit";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.EventValueCircuitBreakerCredit".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.EventValueCircuitBreakerCredit".into()
     }
 }
 /// Indicates that value is leaving the DEX.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventValueCircuitBreakerDebit {
     /// The asset ID being deposited into the DEX.
@@ -1552,14 +1673,16 @@ impl ::prost::Name for EventValueCircuitBreakerDebit {
     const NAME: &'static str = "EventValueCircuitBreakerDebit";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.EventValueCircuitBreakerDebit".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.EventValueCircuitBreakerDebit".into()
     }
 }
 /// Emitted whenever there's non-empty candlestick data for a particular pair.
 ///
 /// Beware: if there's no activity on a given pair, there's no guarantee
 /// that a candlestick will be emitted.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventCandlestickData {
     /// The pair the candlestick is for.
@@ -1573,10 +1696,12 @@ impl ::prost::Name for EventCandlestickData {
     const NAME: &'static str = "EventCandlestickData";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.EventCandlestickData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.EventCandlestickData".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DexParameters {
     /// Whether or not the DEX is enabled.
@@ -1604,10 +1729,12 @@ impl ::prost::Name for DexParameters {
     const NAME: &'static str = "DexParameters";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.DexParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.DexParameters".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GenesisContent {
     /// The initial parameters for the DEX.
@@ -1618,11 +1745,13 @@ impl ::prost::Name for GenesisContent {
     const NAME: &'static str = "GenesisContent";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.GenesisContent".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.GenesisContent".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct CandlestickData {
     /// The height of the candlestick data.
     #[prost(uint64, tag = "1")]
@@ -1650,10 +1779,12 @@ impl ::prost::Name for CandlestickData {
     const NAME: &'static str = "CandlestickData";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.CandlestickData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.CandlestickData".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CandlestickDataRequest {
     /// The directed trading pair to request candlestick data for.
@@ -1678,10 +1809,12 @@ impl ::prost::Name for CandlestickDataRequest {
     const NAME: &'static str = "CandlestickDataRequest";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.CandlestickDataRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.CandlestickDataRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CandlestickDataResponse {
     /// The candlestick data points.
@@ -1692,10 +1825,12 @@ impl ::prost::Name for CandlestickDataResponse {
     const NAME: &'static str = "CandlestickDataResponse";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.CandlestickDataResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.CandlestickDataResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CandlestickDataStreamRequest {
     /// The directed trading pair to subscribe to.
@@ -1706,11 +1841,13 @@ impl ::prost::Name for CandlestickDataStreamRequest {
     const NAME: &'static str = "CandlestickDataStreamRequest";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.CandlestickDataStreamRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.CandlestickDataStreamRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct CandlestickDataStreamResponse {
     /// The candlestick data point.
     #[prost(message, optional, tag = "1")]
@@ -1720,13 +1857,22 @@ impl ::prost::Name for CandlestickDataStreamResponse {
     const NAME: &'static str = "CandlestickDataStreamResponse";
     const PACKAGE: &'static str = "penumbra.core.component.dex.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.dex.v1.{}", Self::NAME)
+        "penumbra.core.component.dex.v1.CandlestickDataStreamResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.dex.v1.CandlestickDataStreamResponse".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query operations for the DEX component.
@@ -1749,8 +1895,8 @@ pub mod query_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -1775,7 +1921,7 @@ pub mod query_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -1822,8 +1968,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1853,8 +1998,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1884,8 +2028,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1915,8 +2058,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1946,8 +2088,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1977,8 +2118,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2010,8 +2150,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2043,8 +2182,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2076,8 +2214,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2107,8 +2244,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2140,8 +2276,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2173,8 +2308,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2197,7 +2331,13 @@ pub mod query_service_client {
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod simulation_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Simulation for the DEX component.
@@ -2224,8 +2364,8 @@ pub mod simulation_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -2250,7 +2390,7 @@ pub mod simulation_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             SimulationServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -2297,8 +2437,7 @@ pub mod simulation_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2321,11 +2460,17 @@ pub mod simulation_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServiceServer.
     #[async_trait]
-    pub trait QueryService: Send + Sync + 'static {
+    pub trait QueryService: std::marker::Send + std::marker::Sync + 'static {
         /// Get the batch clearing prices for a specific block height and trading pair.
         async fn batch_swap_output_data(
             &self,
@@ -2354,7 +2499,7 @@ pub mod query_service_server {
         type SwapExecutionsStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::SwapExecutionsResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Stream all swap executions over a range of heights, optionally subscribing to future executions.
         async fn swap_executions(
@@ -2368,7 +2513,7 @@ pub mod query_service_server {
         type ArbExecutionsStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::ArbExecutionsResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Stream all arbitrage executions over a range of heights, optionally subscribing to future executions.
         async fn arb_executions(
@@ -2385,7 +2530,7 @@ pub mod query_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Query all liquidity positions on the DEX.
         async fn liquidity_positions(
@@ -2412,7 +2557,7 @@ pub mod query_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Query multiple liquidity positions by ID.
         async fn liquidity_positions_by_id(
@@ -2429,7 +2574,7 @@ pub mod query_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Query liquidity positions on a specific pair, sorted by effective price.
         async fn liquidity_positions_by_price(
@@ -2464,7 +2609,7 @@ pub mod query_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Subscribe to candlestick data updates.
         async fn candlestick_data_stream(
@@ -2477,20 +2622,18 @@ pub mod query_service_server {
     }
     /// Query operations for the DEX component.
     #[derive(Debug)]
-    pub struct QueryServiceServer<T: QueryService> {
-        inner: _Inner<T>,
+    pub struct QueryServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: QueryService> QueryServiceServer<T> {
+    impl<T> QueryServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -2540,8 +2683,8 @@ pub mod query_service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServiceServer<T>
     where
         T: QueryService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -2553,7 +2696,6 @@ pub mod query_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.core.component.dex.v1.QueryService/BatchSwapOutputData" => {
                     #[allow(non_camel_case_types)]
@@ -2585,7 +2727,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = BatchSwapOutputDataSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2631,7 +2772,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = SwapExecutionSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2677,7 +2817,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ArbExecutionSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2724,7 +2863,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = SwapExecutionsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2771,7 +2909,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ArbExecutionsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2820,7 +2957,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = LiquidityPositionsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2870,7 +3006,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = LiquidityPositionByIdSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2922,7 +3057,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = LiquidityPositionsByIdSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2976,7 +3110,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = LiquidityPositionsByPriceSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3022,7 +3155,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = SpreadSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3068,7 +3200,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = CandlestickDataSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3120,7 +3251,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = CandlestickDataStreamSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3139,20 +3269,25 @@ pub mod query_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: QueryService> Clone for QueryServiceServer<T> {
+    impl<T> Clone for QueryServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -3164,28 +3299,26 @@ pub mod query_service_server {
             }
         }
     }
-    impl<T: QueryService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: QueryService> tonic::server::NamedService for QueryServiceServer<T> {
-        const NAME: &'static str = "penumbra.core.component.dex.v1.QueryService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.core.component.dex.v1.QueryService";
+    impl<T> tonic::server::NamedService for QueryServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod simulation_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with SimulationServiceServer.
     #[async_trait]
-    pub trait SimulationService: Send + Sync + 'static {
+    pub trait SimulationService: std::marker::Send + std::marker::Sync + 'static {
         /// Simulate routing and trade execution.
         async fn simulate_trade(
             &self,
@@ -3201,20 +3334,18 @@ pub mod simulation_service_server {
     /// simple read query from the state. Thus it poses greater DoS risks, and node
     /// operators may want to enable it separately.
     #[derive(Debug)]
-    pub struct SimulationServiceServer<T: SimulationService> {
-        inner: _Inner<T>,
+    pub struct SimulationServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: SimulationService> SimulationServiceServer<T> {
+    impl<T> SimulationServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -3264,8 +3395,8 @@ pub mod simulation_service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for SimulationServiceServer<T>
     where
         T: SimulationService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -3277,7 +3408,6 @@ pub mod simulation_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.core.component.dex.v1.SimulationService/SimulateTrade" => {
                     #[allow(non_camel_case_types)]
@@ -3309,7 +3439,6 @@ pub mod simulation_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = SimulateTradeSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3328,20 +3457,25 @@ pub mod simulation_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: SimulationService> Clone for SimulationServiceServer<T> {
+    impl<T> Clone for SimulationServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -3353,18 +3487,9 @@ pub mod simulation_service_server {
             }
         }
     }
-    impl<T: SimulationService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: SimulationService> tonic::server::NamedService
-    for SimulationServiceServer<T> {
-        const NAME: &'static str = "penumbra.core.component.dex.v1.SimulationService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.core.component.dex.v1.SimulationService";
+    impl<T> tonic::server::NamedService for SimulationServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.component.dex.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.dex.v1.serde.rs
index cb4fbff28d..e15c31793c 100644
--- a/crates/proto/src/gen/penumbra.core.component.dex.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.component.dex.v1.serde.rs
@@ -12,6 +12,7 @@ impl serde::Serialize for ArbExecutionRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.dex.v1.ArbExecutionRequest", len)?;
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         struct_ser.end()
@@ -116,6 +117,7 @@ impl serde::Serialize for ArbExecutionResponse {
         }
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         struct_ser.end()
@@ -229,10 +231,12 @@ impl serde::Serialize for ArbExecutionsRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.dex.v1.ArbExecutionsRequest", len)?;
         if self.start_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startHeight", ToString::to_string(&self.start_height).as_str())?;
         }
         if self.end_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("endHeight", ToString::to_string(&self.end_height).as_str())?;
         }
         struct_ser.end()
@@ -352,6 +356,7 @@ impl serde::Serialize for ArbExecutionsResponse {
         }
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         struct_ser.end()
@@ -638,6 +643,7 @@ impl serde::Serialize for BatchSwapOutputData {
         }
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         if let Some(v) = self.trading_pair.as_ref() {
@@ -645,10 +651,12 @@ impl serde::Serialize for BatchSwapOutputData {
         }
         if self.epoch_starting_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("epochStartingHeight", ToString::to_string(&self.epoch_starting_height).as_str())?;
         }
         if self.sct_position_prefix != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("sctPositionPrefix", ToString::to_string(&self.sct_position_prefix).as_str())?;
         }
         struct_ser.end()
@@ -862,6 +870,7 @@ impl serde::Serialize for BatchSwapOutputDataRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.dex.v1.BatchSwapOutputDataRequest", len)?;
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         if let Some(v) = self.trading_pair.as_ref() {
@@ -1088,6 +1097,7 @@ impl serde::Serialize for CandlestickData {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.dex.v1.CandlestickData", len)?;
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         if self.open != 0. {
@@ -1293,10 +1303,12 @@ impl serde::Serialize for CandlestickDataRequest {
         }
         if self.limit != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("limit", ToString::to_string(&self.limit).as_str())?;
         }
         if self.start_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startHeight", ToString::to_string(&self.start_height).as_str())?;
         }
         struct_ser.end()
@@ -1994,6 +2006,7 @@ impl serde::Serialize for EventArbExecution {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.dex.v1.EventArbExecution", len)?;
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         if let Some(v) = self.swap_execution.as_ref() {
@@ -2861,6 +2874,7 @@ impl serde::Serialize for EventPositionWithdraw {
         }
         if self.sequence != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("sequence", ToString::to_string(&self.sequence).as_str())?;
         }
         struct_ser.end()
@@ -4150,6 +4164,7 @@ impl serde::Serialize for LiquidityPositionsByPriceRequest {
         }
         if self.limit != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("limit", ToString::to_string(&self.limit).as_str())?;
         }
         struct_ser.end()
@@ -4691,6 +4706,7 @@ impl serde::Serialize for Position {
         }
         if !self.nonce.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("nonce", pbjson::private::base64::encode(&self.nonce).as_str())?;
         }
         if let Some(v) = self.state.as_ref() {
@@ -4942,6 +4958,7 @@ impl serde::Serialize for PositionId {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.dex.v1.PositionId", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         if !self.alt_bech32m.is_empty() {
@@ -5367,6 +5384,7 @@ impl serde::Serialize for PositionState {
         }
         if self.sequence != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("sequence", ToString::to_string(&self.sequence).as_str())?;
         }
         struct_ser.end()
@@ -5568,6 +5586,7 @@ impl serde::Serialize for PositionWithdraw {
         }
         if self.sequence != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("sequence", ToString::to_string(&self.sequence).as_str())?;
         }
         struct_ser.end()
@@ -5711,6 +5730,7 @@ impl serde::Serialize for PositionWithdrawPlan {
         }
         if self.sequence != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("sequence", ToString::to_string(&self.sequence).as_str())?;
         }
         if !self.rewards.is_empty() {
@@ -7009,6 +7029,7 @@ impl serde::Serialize for SwapClaim {
         }
         if self.epoch_duration != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("epochDuration", ToString::to_string(&self.epoch_duration).as_str())?;
         }
         struct_ser.end()
@@ -7314,6 +7335,7 @@ impl serde::Serialize for SwapClaimPlan {
         }
         if self.position != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("position", ToString::to_string(&self.position).as_str())?;
         }
         if let Some(v) = self.output_data.as_ref() {
@@ -7321,14 +7343,17 @@ impl serde::Serialize for SwapClaimPlan {
         }
         if self.epoch_duration != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("epochDuration", ToString::to_string(&self.epoch_duration).as_str())?;
         }
         if !self.proof_blinding_r.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proofBlindingR", pbjson::private::base64::encode(&self.proof_blinding_r).as_str())?;
         }
         if !self.proof_blinding_s.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proofBlindingS", pbjson::private::base64::encode(&self.proof_blinding_s).as_str())?;
         }
         struct_ser.end()
@@ -8079,6 +8104,7 @@ impl serde::Serialize for SwapExecutionRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.dex.v1.SwapExecutionRequest", len)?;
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         if let Some(v) = self.trading_pair.as_ref() {
@@ -8294,10 +8320,12 @@ impl serde::Serialize for SwapExecutionsRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.dex.v1.SwapExecutionsRequest", len)?;
         if self.start_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startHeight", ToString::to_string(&self.start_height).as_str())?;
         }
         if self.end_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("endHeight", ToString::to_string(&self.end_height).as_str())?;
         }
         if let Some(v) = self.trading_pair.as_ref() {
@@ -8435,6 +8463,7 @@ impl serde::Serialize for SwapExecutionsResponse {
         }
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         if let Some(v) = self.trading_pair.as_ref() {
@@ -8566,6 +8595,7 @@ impl serde::Serialize for SwapPayload {
         }
         if !self.encrypted_swap.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("encryptedSwap", pbjson::private::base64::encode(&self.encrypted_swap).as_str())?;
         }
         struct_ser.end()
@@ -8706,6 +8736,7 @@ impl serde::Serialize for SwapPlaintext {
         }
         if !self.rseed.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("rseed", pbjson::private::base64::encode(&self.rseed).as_str())?;
         }
         struct_ser.end()
@@ -8876,14 +8907,17 @@ impl serde::Serialize for SwapPlan {
         }
         if !self.fee_blinding.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("feeBlinding", pbjson::private::base64::encode(&self.fee_blinding).as_str())?;
         }
         if !self.proof_blinding_r.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proofBlindingR", pbjson::private::base64::encode(&self.proof_blinding_r).as_str())?;
         }
         if !self.proof_blinding_s.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proofBlindingS", pbjson::private::base64::encode(&self.proof_blinding_s).as_str())?;
         }
         struct_ser.end()
@@ -9768,6 +9802,7 @@ impl serde::Serialize for ZkSwapClaimProof {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.dex.v1.ZKSwapClaimProof", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -9866,6 +9901,7 @@ impl serde::Serialize for ZkSwapProof {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.dex.v1.ZKSwapProof", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.core.component.distributions.v1.rs b/crates/proto/src/gen/penumbra.core.component.distributions.v1.rs
index 8e9c616aad..8ad924095d 100644
--- a/crates/proto/src/gen/penumbra.core.component.distributions.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.component.distributions.v1.rs
@@ -1,6 +1,6 @@
+// This file is @generated by prost-build.
 /// Distribution configuration data.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct DistributionsParameters {
     /// The amount of staking token issued per block.
     #[prost(uint64, tag = "1")]
@@ -10,14 +10,14 @@ impl ::prost::Name for DistributionsParameters {
     const NAME: &'static str = "DistributionsParameters";
     const PACKAGE: &'static str = "penumbra.core.component.distributions.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.distributions.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.distributions.v1.DistributionsParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.distributions.v1.DistributionsParameters".into()
     }
 }
 /// Genesis data for the distributions module.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct GenesisContent {
     #[prost(message, optional, tag = "1")]
     pub distributions_params: ::core::option::Option<DistributionsParameters>,
@@ -26,8 +26,9 @@ impl ::prost::Name for GenesisContent {
     const NAME: &'static str = "GenesisContent";
     const PACKAGE: &'static str = "penumbra.core.component.distributions.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.distributions.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.distributions.v1.GenesisContent".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.distributions.v1.GenesisContent".into()
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.component.distributions.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.distributions.v1.serde.rs
index 7571336852..efe1238b66 100644
--- a/crates/proto/src/gen/penumbra.core.component.distributions.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.component.distributions.v1.serde.rs
@@ -12,6 +12,7 @@ impl serde::Serialize for DistributionsParameters {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.distributions.v1.DistributionsParameters", len)?;
         if self.staking_issuance_per_block != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("stakingIssuancePerBlock", ToString::to_string(&self.staking_issuance_per_block).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.core.component.fee.v1.rs b/crates/proto/src/gen/penumbra.core.component.fee.v1.rs
index e3ae15a7b0..287db509e6 100644
--- a/crates/proto/src/gen/penumbra.core.component.fee.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.component.fee.v1.rs
@@ -1,5 +1,5 @@
+// This file is @generated by prost-build.
 /// Specifies fees paid by a transaction.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Fee {
     /// The amount of the token used to pay fees.
@@ -14,14 +14,16 @@ impl ::prost::Name for Fee {
     const NAME: &'static str = "Fee";
     const PACKAGE: &'static str = "penumbra.core.component.fee.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.fee.v1.{}", Self::NAME)
+        "penumbra.core.component.fee.v1.Fee".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.fee.v1.Fee".into()
     }
 }
 /// Gas usage for a transaction.
 ///
 /// Gas used is multiplied by `GasPrices` to determine a `Fee`.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct Gas {
     /// The amount of block space used.
     #[prost(uint64, tag = "1")]
@@ -40,10 +42,12 @@ impl ::prost::Name for Gas {
     const NAME: &'static str = "Gas";
     const PACKAGE: &'static str = "penumbra.core.component.fee.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.fee.v1.{}", Self::NAME)
+        "penumbra.core.component.fee.v1.Gas".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.fee.v1.Gas".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GasPrices {
     /// The asset ID of the fee token these prices are for.
@@ -68,11 +72,13 @@ impl ::prost::Name for GasPrices {
     const NAME: &'static str = "GasPrices";
     const PACKAGE: &'static str = "penumbra.core.component.fee.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.fee.v1.{}", Self::NAME)
+        "penumbra.core.component.fee.v1.GasPrices".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.fee.v1.GasPrices".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct FeeTier {
     /// The selected fee tier.
     #[prost(enumeration = "fee_tier::Tier", tag = "1")]
@@ -106,10 +112,10 @@ pub mod fee_tier {
         /// (if the ProtoBuf definition does not change) and safe for programmatic use.
         pub fn as_str_name(&self) -> &'static str {
             match self {
-                Tier::Unspecified => "TIER_UNSPECIFIED",
-                Tier::Low => "TIER_LOW",
-                Tier::Medium => "TIER_MEDIUM",
-                Tier::High => "TIER_HIGH",
+                Self::Unspecified => "TIER_UNSPECIFIED",
+                Self::Low => "TIER_LOW",
+                Self::Medium => "TIER_MEDIUM",
+                Self::High => "TIER_HIGH",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.
@@ -128,11 +134,13 @@ impl ::prost::Name for FeeTier {
     const NAME: &'static str = "FeeTier";
     const PACKAGE: &'static str = "penumbra.core.component.fee.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.fee.v1.{}", Self::NAME)
+        "penumbra.core.component.fee.v1.FeeTier".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.fee.v1.FeeTier".into()
     }
 }
 /// Fee component configuration data.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct FeeParameters {
     /// Fixed gas prices in the native token used to compute transactions' base
@@ -157,11 +165,13 @@ impl ::prost::Name for FeeParameters {
     const NAME: &'static str = "FeeParameters";
     const PACKAGE: &'static str = "penumbra.core.component.fee.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.fee.v1.{}", Self::NAME)
+        "penumbra.core.component.fee.v1.FeeParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.fee.v1.FeeParameters".into()
     }
 }
 /// Fee-specific genesis content.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GenesisContent {
     /// The FeeParameters present at genesis.
@@ -172,20 +182,24 @@ impl ::prost::Name for GenesisContent {
     const NAME: &'static str = "GenesisContent";
     const PACKAGE: &'static str = "penumbra.core.component.fee.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.fee.v1.{}", Self::NAME)
+        "penumbra.core.component.fee.v1.GenesisContent".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.fee.v1.GenesisContent".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct CurrentGasPricesRequest {}
 impl ::prost::Name for CurrentGasPricesRequest {
     const NAME: &'static str = "CurrentGasPricesRequest";
     const PACKAGE: &'static str = "penumbra.core.component.fee.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.fee.v1.{}", Self::NAME)
+        "penumbra.core.component.fee.v1.CurrentGasPricesRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.fee.v1.CurrentGasPricesRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CurrentGasPricesResponse {
     /// The current gas prices, in the preferred (native) token.
@@ -199,11 +213,13 @@ impl ::prost::Name for CurrentGasPricesResponse {
     const NAME: &'static str = "CurrentGasPricesResponse";
     const PACKAGE: &'static str = "penumbra.core.component.fee.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.fee.v1.{}", Self::NAME)
+        "penumbra.core.component.fee.v1.CurrentGasPricesResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.fee.v1.CurrentGasPricesResponse".into()
     }
 }
 /// Emitted during fee payment.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventPaidFee {
     /// The fee paid.
@@ -223,11 +239,13 @@ impl ::prost::Name for EventPaidFee {
     const NAME: &'static str = "EventPaidFee";
     const PACKAGE: &'static str = "penumbra.core.component.fee.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.fee.v1.{}", Self::NAME)
+        "penumbra.core.component.fee.v1.EventPaidFee".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.fee.v1.EventPaidFee".into()
     }
 }
 /// Emitted as a summary of fees in the block.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventBlockFees {
     /// The total fees, after swapping to the native token.
@@ -244,13 +262,22 @@ impl ::prost::Name for EventBlockFees {
     const NAME: &'static str = "EventBlockFees";
     const PACKAGE: &'static str = "penumbra.core.component.fee.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.fee.v1.{}", Self::NAME)
+        "penumbra.core.component.fee.v1.EventBlockFees".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.fee.v1.EventBlockFees".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query operations for the fee component.
@@ -273,8 +300,8 @@ pub mod query_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -299,7 +326,7 @@ pub mod query_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -346,8 +373,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -370,11 +396,17 @@ pub mod query_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServiceServer.
     #[async_trait]
-    pub trait QueryService: Send + Sync + 'static {
+    pub trait QueryService: std::marker::Send + std::marker::Sync + 'static {
         /// Get the current gas prices.
         async fn current_gas_prices(
             &self,
@@ -386,20 +418,18 @@ pub mod query_service_server {
     }
     /// Query operations for the fee component.
     #[derive(Debug)]
-    pub struct QueryServiceServer<T: QueryService> {
-        inner: _Inner<T>,
+    pub struct QueryServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: QueryService> QueryServiceServer<T> {
+    impl<T> QueryServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -449,8 +479,8 @@ pub mod query_service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServiceServer<T>
     where
         T: QueryService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -462,7 +492,6 @@ pub mod query_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.core.component.fee.v1.QueryService/CurrentGasPrices" => {
                     #[allow(non_camel_case_types)]
@@ -494,7 +523,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = CurrentGasPricesSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -513,20 +541,25 @@ pub mod query_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: QueryService> Clone for QueryServiceServer<T> {
+    impl<T> Clone for QueryServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -538,17 +571,9 @@ pub mod query_service_server {
             }
         }
     }
-    impl<T: QueryService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: QueryService> tonic::server::NamedService for QueryServiceServer<T> {
-        const NAME: &'static str = "penumbra.core.component.fee.v1.QueryService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.core.component.fee.v1.QueryService";
+    impl<T> tonic::server::NamedService for QueryServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.component.fee.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.fee.v1.serde.rs
index 2d9df3b9be..1d166c08f5 100644
--- a/crates/proto/src/gen/penumbra.core.component.fee.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.component.fee.v1.serde.rs
@@ -889,18 +889,22 @@ impl serde::Serialize for Gas {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.fee.v1.Gas", len)?;
         if self.block_space != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("blockSpace", ToString::to_string(&self.block_space).as_str())?;
         }
         if self.compact_block_space != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("compactBlockSpace", ToString::to_string(&self.compact_block_space).as_str())?;
         }
         if self.verification != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("verification", ToString::to_string(&self.verification).as_str())?;
         }
         if self.execution != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("execution", ToString::to_string(&self.execution).as_str())?;
         }
         struct_ser.end()
@@ -1055,18 +1059,22 @@ impl serde::Serialize for GasPrices {
         }
         if self.block_space_price != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("blockSpacePrice", ToString::to_string(&self.block_space_price).as_str())?;
         }
         if self.compact_block_space_price != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("compactBlockSpacePrice", ToString::to_string(&self.compact_block_space_price).as_str())?;
         }
         if self.verification_price != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("verificationPrice", ToString::to_string(&self.verification_price).as_str())?;
         }
         if self.execution_price != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("executionPrice", ToString::to_string(&self.execution_price).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.core.component.funding.v1.rs b/crates/proto/src/gen/penumbra.core.component.funding.v1.rs
index 2db78e4ba8..d72e5db496 100644
--- a/crates/proto/src/gen/penumbra.core.component.funding.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.component.funding.v1.rs
@@ -1,17 +1,19 @@
+// This file is @generated by prost-build.
 /// Funding component configuration data.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct FundingParameters {}
 impl ::prost::Name for FundingParameters {
     const NAME: &'static str = "FundingParameters";
     const PACKAGE: &'static str = "penumbra.core.component.funding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.funding.v1.{}", Self::NAME)
+        "penumbra.core.component.funding.v1.FundingParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.funding.v1.FundingParameters".into()
     }
 }
 /// Genesis data for the funding component.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct GenesisContent {
     #[prost(message, optional, tag = "1")]
     pub funding_params: ::core::option::Option<FundingParameters>,
@@ -20,11 +22,13 @@ impl ::prost::Name for GenesisContent {
     const NAME: &'static str = "GenesisContent";
     const PACKAGE: &'static str = "penumbra.core.component.funding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.funding.v1.{}", Self::NAME)
+        "penumbra.core.component.funding.v1.GenesisContent".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.funding.v1.GenesisContent".into()
     }
 }
 /// Indicates that a funding stream reward was paid.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventFundingStreamReward {
     /// The recipient of the funding stream reward.
@@ -44,6 +48,9 @@ impl ::prost::Name for EventFundingStreamReward {
     const NAME: &'static str = "EventFundingStreamReward";
     const PACKAGE: &'static str = "penumbra.core.component.funding.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.funding.v1.{}", Self::NAME)
+        "penumbra.core.component.funding.v1.EventFundingStreamReward".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.funding.v1.EventFundingStreamReward".into()
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.component.funding.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.funding.v1.serde.rs
index 833eeed457..827556590e 100644
--- a/crates/proto/src/gen/penumbra.core.component.funding.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.component.funding.v1.serde.rs
@@ -21,6 +21,7 @@ impl serde::Serialize for EventFundingStreamReward {
         }
         if self.epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("epochIndex", ToString::to_string(&self.epoch_index).as_str())?;
         }
         if let Some(v) = self.reward_amount.as_ref() {
diff --git a/crates/proto/src/gen/penumbra.core.component.governance.v1.rs b/crates/proto/src/gen/penumbra.core.component.governance.v1.rs
index 4c188cf312..d278363f49 100644
--- a/crates/proto/src/gen/penumbra.core.component.governance.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.component.governance.v1.rs
@@ -1,5 +1,5 @@
+// This file is @generated by prost-build.
 /// A Penumbra ZK delegator vote proof.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ZkDelegatorVoteProof {
     #[prost(bytes = "vec", tag = "1")]
@@ -9,10 +9,12 @@ impl ::prost::Name for ZkDelegatorVoteProof {
     const NAME: &'static str = "ZKDelegatorVoteProof";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ZKDelegatorVoteProof".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ZKDelegatorVoteProof".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProposalSubmit {
     /// The proposal to be submitted.
@@ -26,10 +28,12 @@ impl ::prost::Name for ProposalSubmit {
     const NAME: &'static str = "ProposalSubmit";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ProposalSubmit".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ProposalSubmit".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProposalWithdraw {
     /// The proposal to be withdrawn.
@@ -43,10 +47,12 @@ impl ::prost::Name for ProposalWithdraw {
     const NAME: &'static str = "ProposalWithdraw";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ProposalWithdraw".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ProposalWithdraw".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProposalDepositClaim {
     /// The proposal to claim the deposit for.
@@ -63,10 +69,12 @@ impl ::prost::Name for ProposalDepositClaim {
     const NAME: &'static str = "ProposalDepositClaim";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ProposalDepositClaim".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ProposalDepositClaim".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorVote {
     /// The effecting data for the vote.
@@ -82,10 +90,12 @@ impl ::prost::Name for ValidatorVote {
     const NAME: &'static str = "ValidatorVote";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ValidatorVote".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ValidatorVote".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorVoteReason {
     #[prost(string, tag = "1")]
@@ -95,10 +105,12 @@ impl ::prost::Name for ValidatorVoteReason {
     const NAME: &'static str = "ValidatorVoteReason";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ValidatorVoteReason".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ValidatorVoteReason".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorVoteBody {
     /// The proposal being voted on.
@@ -123,10 +135,12 @@ impl ::prost::Name for ValidatorVoteBody {
     const NAME: &'static str = "ValidatorVoteBody";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ValidatorVoteBody".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ValidatorVoteBody".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DelegatorVote {
     /// The effecting data for the vote.
@@ -145,10 +159,12 @@ impl ::prost::Name for DelegatorVote {
     const NAME: &'static str = "DelegatorVote";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.DelegatorVote".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.DelegatorVote".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DelegatorVoteBody {
     /// The proposal being voted on.
@@ -179,10 +195,12 @@ impl ::prost::Name for DelegatorVoteBody {
     const NAME: &'static str = "DelegatorVoteBody";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.DelegatorVoteBody".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.DelegatorVoteBody".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DelegatorVoteView {
     #[prost(oneof = "delegator_vote_view::DelegatorVote", tags = "1, 2")]
@@ -190,7 +208,6 @@ pub struct DelegatorVoteView {
 }
 /// Nested message and enum types in `DelegatorVoteView`.
 pub mod delegator_vote_view {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Visible {
         #[prost(message, optional, tag = "1")]
@@ -204,12 +221,12 @@ pub mod delegator_vote_view {
         const NAME: &'static str = "Visible";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.DelegatorVoteView.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.DelegatorVoteView.Visible".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.DelegatorVoteView.Visible".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Opaque {
         #[prost(message, optional, tag = "1")]
@@ -219,12 +236,12 @@ pub mod delegator_vote_view {
         const NAME: &'static str = "Opaque";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.DelegatorVoteView.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.DelegatorVoteView.Opaque".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.DelegatorVoteView.Opaque".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum DelegatorVote {
         #[prost(message, tag = "1")]
@@ -237,10 +254,12 @@ impl ::prost::Name for DelegatorVoteView {
     const NAME: &'static str = "DelegatorVoteView";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.DelegatorVoteView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.DelegatorVoteView".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DelegatorVotePlan {
     /// The proposal to vote on.
@@ -275,10 +294,12 @@ impl ::prost::Name for DelegatorVotePlan {
     const NAME: &'static str = "DelegatorVotePlan";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.DelegatorVotePlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.DelegatorVotePlan".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CommunityPoolDeposit {
     /// The value to deposit into the Community Pool.
@@ -289,10 +310,12 @@ impl ::prost::Name for CommunityPoolDeposit {
     const NAME: &'static str = "CommunityPoolDeposit";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.CommunityPoolDeposit".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.CommunityPoolDeposit".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CommunityPoolSpend {
     /// The value to spend from the Community Pool.
@@ -303,10 +326,12 @@ impl ::prost::Name for CommunityPoolSpend {
     const NAME: &'static str = "CommunityPoolSpend";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.CommunityPoolSpend".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.CommunityPoolSpend".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CommunityPoolOutput {
     /// The value to output from the Community Pool.
@@ -320,12 +345,14 @@ impl ::prost::Name for CommunityPoolOutput {
     const NAME: &'static str = "CommunityPoolOutput";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.CommunityPoolOutput".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.CommunityPoolOutput".into()
     }
 }
 /// A vote on a proposal.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct Vote {
     /// The vote.
     #[prost(enumeration = "vote::Vote", tag = "1")]
@@ -359,10 +386,10 @@ pub mod vote {
         /// (if the ProtoBuf definition does not change) and safe for programmatic use.
         pub fn as_str_name(&self) -> &'static str {
             match self {
-                Vote::Unspecified => "VOTE_UNSPECIFIED",
-                Vote::Abstain => "VOTE_ABSTAIN",
-                Vote::Yes => "VOTE_YES",
-                Vote::No => "VOTE_NO",
+                Self::Unspecified => "VOTE_UNSPECIFIED",
+                Self::Abstain => "VOTE_ABSTAIN",
+                Self::Yes => "VOTE_YES",
+                Self::No => "VOTE_NO",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.
@@ -381,11 +408,13 @@ impl ::prost::Name for Vote {
     const NAME: &'static str = "Vote";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.Vote".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.Vote".into()
     }
 }
 /// The current state of a proposal.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProposalState {
     /// The state of the proposal.
@@ -395,20 +424,19 @@ pub struct ProposalState {
 /// Nested message and enum types in `ProposalState`.
 pub mod proposal_state {
     /// Voting is in progress and the proposal has not yet concluded voting or been withdrawn.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct Voting {}
     impl ::prost::Name for Voting {
         const NAME: &'static str = "Voting";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.ProposalState.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.ProposalState.Voting".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.ProposalState.Voting".into()
         }
     }
     /// The proposal has been withdrawn but the voting period is not yet concluded.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Withdrawn {
         /// The reason for the withdrawal.
@@ -419,13 +447,13 @@ pub mod proposal_state {
         const NAME: &'static str = "Withdrawn";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.ProposalState.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.ProposalState.Withdrawn".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.ProposalState.Withdrawn".into()
         }
     }
     /// The voting period has ended, and the proposal has been assigned an outcome.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Finished {
         #[prost(message, optional, tag = "1")]
@@ -435,13 +463,13 @@ pub mod proposal_state {
         const NAME: &'static str = "Finished";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.ProposalState.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.ProposalState.Finished".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.ProposalState.Finished".into()
         }
     }
     /// The voting period has ended, and the original proposer has claimed their deposit.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Claimed {
         #[prost(message, optional, tag = "1")]
@@ -451,13 +479,13 @@ pub mod proposal_state {
         const NAME: &'static str = "Claimed";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.ProposalState.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.ProposalState.Claimed".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.ProposalState.Claimed".into()
         }
     }
     /// The state of the proposal.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum State {
         #[prost(message, tag = "2")]
@@ -474,11 +502,13 @@ impl ::prost::Name for ProposalState {
     const NAME: &'static str = "ProposalState";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ProposalState".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ProposalState".into()
     }
 }
 /// The outcome of a concluded proposal.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProposalOutcome {
     #[prost(oneof = "proposal_outcome::Outcome", tags = "1, 2, 3")]
@@ -487,7 +517,6 @@ pub struct ProposalOutcome {
 /// Nested message and enum types in `ProposalOutcome`.
 pub mod proposal_outcome {
     /// Whether or not the proposal was withdrawn.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Withdrawn {
         /// The reason for withdrawing the proposal during the voting period.
@@ -498,26 +527,26 @@ pub mod proposal_outcome {
         const NAME: &'static str = "Withdrawn";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.ProposalOutcome.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.ProposalOutcome.Withdrawn".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.ProposalOutcome.Withdrawn".into()
         }
     }
     /// The proposal was passed.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct Passed {}
     impl ::prost::Name for Passed {
         const NAME: &'static str = "Passed";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.ProposalOutcome.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.ProposalOutcome.Passed".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.ProposalOutcome.Passed".into()
         }
     }
     /// The proposal did not pass.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Failed {
         /// Present if the proposal was withdrawn during the voting period.
@@ -528,13 +557,13 @@ pub mod proposal_outcome {
         const NAME: &'static str = "Failed";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.ProposalOutcome.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.ProposalOutcome.Failed".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.ProposalOutcome.Failed".into()
         }
     }
     /// The proposal did not pass, and was slashed.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Slashed {
         /// Present if the proposal was withdrawn during the voting period.
@@ -545,12 +574,12 @@ pub mod proposal_outcome {
         const NAME: &'static str = "Slashed";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.ProposalOutcome.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.ProposalOutcome.Slashed".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.ProposalOutcome.Slashed".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Outcome {
         #[prost(message, tag = "1")]
@@ -565,12 +594,14 @@ impl ::prost::Name for ProposalOutcome {
     const NAME: &'static str = "ProposalOutcome";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ProposalOutcome".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ProposalOutcome".into()
     }
 }
 /// A tally of votes on a proposal.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct Tally {
     /// The number of votes in favor of the proposal.
     #[prost(uint64, tag = "1")]
@@ -586,11 +617,13 @@ impl ::prost::Name for Tally {
     const NAME: &'static str = "Tally";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.Tally".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.Tally".into()
     }
 }
 /// A proposal to be voted upon.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Proposal {
     /// The unique identifier of the proposal.
@@ -612,7 +645,6 @@ pub mod proposal {
     /// effect when passed.
     ///
     /// It optionally contains a reference to a commit which contains code to upgrade the chain.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Signaling {
         /// The commit to be voted upon, if any is relevant.
@@ -623,9 +655,10 @@ pub mod proposal {
         const NAME: &'static str = "Signaling";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.Proposal.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.Proposal.Signaling".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.Proposal.Signaling".into()
         }
     }
     /// An emergency proposal can be passed instantaneously by a 1/3 majority of validators, without
@@ -633,8 +666,7 @@ pub mod proposal {
     ///
     /// If the boolean `halt_chain` is set to `true`, then the chain will halt immediately when the
     /// proposal is passed.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct Emergency {
         /// If `true`, the chain will halt immediately when the proposal is passed.
         #[prost(bool, tag = "1")]
@@ -644,14 +676,14 @@ pub mod proposal {
         const NAME: &'static str = "Emergency";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.Proposal.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.Proposal.Emergency".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.Proposal.Emergency".into()
         }
     }
     /// A parameter change proposal describes a replacement of the app parameters, which should take
     /// effect when the proposal is passed.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct ParameterChange {
         /// DEPRECATED
@@ -678,15 +710,15 @@ pub mod proposal {
         const NAME: &'static str = "ParameterChange";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.Proposal.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.Proposal.ParameterChange".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.Proposal.ParameterChange".into()
         }
     }
     /// A Community Pool spend proposal describes zero or more transactions to execute on behalf of the Community Pool, with
     /// access to its funds, and zero or more scheduled transactions from previous passed proposals to
     /// cancel.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct CommunityPoolSpend {
         /// The transaction plan to be executed at the time the proposal is passed. This must be a
@@ -699,15 +731,15 @@ pub mod proposal {
         const NAME: &'static str = "CommunityPoolSpend";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.Proposal.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.Proposal.CommunityPoolSpend".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.Proposal.CommunityPoolSpend".into()
         }
     }
     /// An upgrade plan describes a candidate upgrade to be executed at a certain height. If passed, the chain
     /// will halt at the specified height.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct UpgradePlan {
         #[prost(uint64, tag = "1")]
         pub height: u64,
@@ -716,15 +748,15 @@ pub mod proposal {
         const NAME: &'static str = "UpgradePlan";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.Proposal.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.Proposal.UpgradePlan".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.Proposal.UpgradePlan".into()
         }
     }
     /// Freeze an existing IBC client.
     /// Like `Emergency` proposals, it is enacted immediately after receiving
     /// +2/3 of validator votes.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct FreezeIbcClient {
         #[prost(string, tag = "1")]
@@ -734,15 +766,15 @@ pub mod proposal {
         const NAME: &'static str = "FreezeIbcClient";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.Proposal.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.Proposal.FreezeIbcClient".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.Proposal.FreezeIbcClient".into()
         }
     }
     /// Unfreeze an existing IBC client.
     /// Like `Emergency` proposals, it is enacted immediately after receiving
     /// +2/3 of validator votes.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct UnfreezeIbcClient {
         #[prost(string, tag = "1")]
@@ -752,13 +784,13 @@ pub mod proposal {
         const NAME: &'static str = "UnfreezeIbcClient";
         const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.governance.v1.Proposal.{}", Self::NAME
-            )
+            "penumbra.core.component.governance.v1.Proposal.UnfreezeIbcClient".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.governance.v1.Proposal.UnfreezeIbcClient".into()
         }
     }
     /// The proposal's payload.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Payload {
         #[prost(message, tag = "5")]
@@ -781,11 +813,13 @@ impl ::prost::Name for Proposal {
     const NAME: &'static str = "Proposal";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.Proposal".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.Proposal".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ProposalInfoRequest {
     /// The proposal id to request information on.
     #[prost(uint64, tag = "2")]
@@ -795,11 +829,13 @@ impl ::prost::Name for ProposalInfoRequest {
     const NAME: &'static str = "ProposalInfoRequest";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ProposalInfoRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ProposalInfoRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ProposalInfoResponse {
     /// The block height at which the proposal started voting.
     #[prost(uint64, tag = "1")]
@@ -812,11 +848,13 @@ impl ::prost::Name for ProposalInfoResponse {
     const NAME: &'static str = "ProposalInfoResponse";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ProposalInfoResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ProposalInfoResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ProposalDataRequest {
     /// The proposal id to request information on.
     #[prost(uint64, tag = "2")]
@@ -826,10 +864,12 @@ impl ::prost::Name for ProposalDataRequest {
     const NAME: &'static str = "ProposalDataRequest";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ProposalDataRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ProposalDataRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProposalDataResponse {
     /// The proposal metadata.
@@ -857,12 +897,14 @@ impl ::prost::Name for ProposalDataResponse {
     const NAME: &'static str = "ProposalDataResponse";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ProposalDataResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ProposalDataResponse".into()
     }
 }
 /// Requests the validator rate data for a proposal.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ProposalRateDataRequest {
     /// The proposal id to request information on.
     #[prost(uint64, tag = "2")]
@@ -872,11 +914,13 @@ impl ::prost::Name for ProposalRateDataRequest {
     const NAME: &'static str = "ProposalRateDataRequest";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ProposalRateDataRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ProposalRateDataRequest".into()
     }
 }
 /// The rate data for a single validator.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProposalRateDataResponse {
     #[prost(message, optional, tag = "1")]
@@ -886,12 +930,14 @@ impl ::prost::Name for ProposalRateDataResponse {
     const NAME: &'static str = "ProposalRateDataResponse";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ProposalRateDataResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ProposalRateDataResponse".into()
     }
 }
 /// Requests the list of all proposals.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ProposalListRequest {
     /// Whether to include proposals that are no longer active.;
     ///
@@ -903,11 +949,13 @@ impl ::prost::Name for ProposalListRequest {
     const NAME: &'static str = "ProposalListRequest";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ProposalListRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ProposalListRequest".into()
     }
 }
 /// The data for a single proposal.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProposalListResponse {
     /// The proposal metadata.
@@ -930,12 +978,14 @@ impl ::prost::Name for ProposalListResponse {
     const NAME: &'static str = "ProposalListResponse";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ProposalListResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ProposalListResponse".into()
     }
 }
 /// Requests the list of all validator votes for a given proposal.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ValidatorVotesRequest {
     /// The proposal id to request information on.
     #[prost(uint64, tag = "2")]
@@ -945,11 +995,13 @@ impl ::prost::Name for ValidatorVotesRequest {
     const NAME: &'static str = "ValidatorVotesRequest";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ValidatorVotesRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ValidatorVotesRequest".into()
     }
 }
 /// The data for a single validator vote.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorVotesResponse {
     /// The vote.
@@ -963,11 +1015,13 @@ impl ::prost::Name for ValidatorVotesResponse {
     const NAME: &'static str = "ValidatorVotesResponse";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ValidatorVotesResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ValidatorVotesResponse".into()
     }
 }
 /// Governance configuration data.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GovernanceParameters {
     /// The number of blocks during which a proposal is voted on.
@@ -994,11 +1048,13 @@ impl ::prost::Name for GovernanceParameters {
     const NAME: &'static str = "GovernanceParameters";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.GovernanceParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.GovernanceParameters".into()
     }
 }
 /// Governance genesis state.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GenesisContent {
     /// Governance parameters.
@@ -1009,10 +1065,12 @@ impl ::prost::Name for GenesisContent {
     const NAME: &'static str = "GenesisContent";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.GenesisContent".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.GenesisContent".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EncodedParameter {
     /// The component name in the `AppParameters`.
@@ -1035,11 +1093,13 @@ impl ::prost::Name for EncodedParameter {
     const NAME: &'static str = "EncodedParameter";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.EncodedParameter".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.EncodedParameter".into()
     }
 }
 /// DEPRECATED
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ChangedAppParameters {
     /// Sct module parameters.
@@ -1090,11 +1150,13 @@ impl ::prost::Name for ChangedAppParameters {
     const NAME: &'static str = "ChangedAppParameters";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ChangedAppParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ChangedAppParameters".into()
     }
 }
 /// DEPRECATED
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ChangedAppParametersSet {
     /// The set of app parameters at the time the proposal was submitted.
@@ -1108,10 +1170,12 @@ impl ::prost::Name for ChangedAppParametersSet {
     const NAME: &'static str = "ChangedAppParametersSet";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.ChangedAppParametersSet".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.ChangedAppParametersSet".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct VotingPowerAtProposalStartRequest {
     /// The proposal id to request information on.
@@ -1125,11 +1189,13 @@ impl ::prost::Name for VotingPowerAtProposalStartRequest {
     const NAME: &'static str = "VotingPowerAtProposalStartRequest";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.VotingPowerAtProposalStartRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.VotingPowerAtProposalStartRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct VotingPowerAtProposalStartResponse {
     /// The voting power for the given identity key at the start of the proposal.
     /// TODO: since we don't support optional fields in our protos any more,
@@ -1142,11 +1208,14 @@ impl ::prost::Name for VotingPowerAtProposalStartResponse {
     const NAME: &'static str = "VotingPowerAtProposalStartResponse";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.VotingPowerAtProposalStartResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.VotingPowerAtProposalStartResponse"
+            .into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct AllTalliedDelegatorVotesForProposalRequest {
     /// The proposal id to request information on.
     #[prost(uint64, tag = "2")]
@@ -1156,10 +1225,14 @@ impl ::prost::Name for AllTalliedDelegatorVotesForProposalRequest {
     const NAME: &'static str = "AllTalliedDelegatorVotesForProposalRequest";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.AllTalliedDelegatorVotesForProposalRequest"
+            .into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.AllTalliedDelegatorVotesForProposalRequest"
+            .into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AllTalliedDelegatorVotesForProposalResponse {
     /// The tally of delegator votes for a given validator for the proposal.
@@ -1173,21 +1246,27 @@ impl ::prost::Name for AllTalliedDelegatorVotesForProposalResponse {
     const NAME: &'static str = "AllTalliedDelegatorVotesForProposalResponse";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.AllTalliedDelegatorVotesForProposalResponse"
+            .into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.AllTalliedDelegatorVotesForProposalResponse"
+            .into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct NextProposalIdRequest {}
 impl ::prost::Name for NextProposalIdRequest {
     const NAME: &'static str = "NextProposalIdRequest";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.NextProposalIdRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.NextProposalIdRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct NextProposalIdResponse {
     /// The next proposal ID.
     #[prost(uint64, tag = "1")]
@@ -1197,12 +1276,14 @@ impl ::prost::Name for NextProposalIdResponse {
     const NAME: &'static str = "NextProposalIdResponse";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.NextProposalIdResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.NextProposalIdResponse".into()
     }
 }
 /// The ratio between two numbers, used in governance to describe vote thresholds and quorums.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct Ratio {
     /// The numerator.
     #[prost(uint64, tag = "1")]
@@ -1215,10 +1296,12 @@ impl ::prost::Name for Ratio {
     const NAME: &'static str = "Ratio";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.Ratio".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.Ratio".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventDelegatorVote {
     /// The delegator vote.
@@ -1234,10 +1317,12 @@ impl ::prost::Name for EventDelegatorVote {
     const NAME: &'static str = "EventDelegatorVote";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.EventDelegatorVote".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.EventDelegatorVote".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventProposalDepositClaim {
     /// The deposit claim body.
@@ -1248,10 +1333,12 @@ impl ::prost::Name for EventProposalDepositClaim {
     const NAME: &'static str = "EventProposalDepositClaim";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.EventProposalDepositClaim".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.EventProposalDepositClaim".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventValidatorVote {
     /// The validator vote.
@@ -1265,10 +1352,12 @@ impl ::prost::Name for EventValidatorVote {
     const NAME: &'static str = "EventValidatorVote";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.EventValidatorVote".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.EventValidatorVote".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventProposalWithdraw {
     /// Details on the withdrawn proposal.
@@ -1279,10 +1368,12 @@ impl ::prost::Name for EventProposalWithdraw {
     const NAME: &'static str = "EventProposalWithdraw";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.EventProposalWithdraw".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.EventProposalWithdraw".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventProposalSubmit {
     /// Details on the submitted proposal.
@@ -1299,10 +1390,12 @@ impl ::prost::Name for EventProposalSubmit {
     const NAME: &'static str = "EventProposalSubmit";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.EventProposalSubmit".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.EventProposalSubmit".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventProposalPassed {
     /// The passed proposal.
@@ -1313,10 +1406,12 @@ impl ::prost::Name for EventProposalPassed {
     const NAME: &'static str = "EventProposalPassed";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.EventProposalPassed".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.EventProposalPassed".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventProposalFailed {
     /// The failed proposal.
@@ -1327,10 +1422,12 @@ impl ::prost::Name for EventProposalFailed {
     const NAME: &'static str = "EventProposalFailed";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.EventProposalFailed".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.EventProposalFailed".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventProposalSlashed {
     /// The slashed proposal.
@@ -1341,7 +1438,10 @@ impl ::prost::Name for EventProposalSlashed {
     const NAME: &'static str = "EventProposalSlashed";
     const PACKAGE: &'static str = "penumbra.core.component.governance.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.governance.v1.{}", Self::NAME)
+        "penumbra.core.component.governance.v1.EventProposalSlashed".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.governance.v1.EventProposalSlashed".into()
     }
 }
 /// All the different kinds of proposals.
@@ -1365,14 +1465,14 @@ impl ProposalKind {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            ProposalKind::Unspecified => "PROPOSAL_KIND_UNSPECIFIED",
-            ProposalKind::Signaling => "PROPOSAL_KIND_SIGNALING",
-            ProposalKind::Emergency => "PROPOSAL_KIND_EMERGENCY",
-            ProposalKind::ParameterChange => "PROPOSAL_KIND_PARAMETER_CHANGE",
-            ProposalKind::CommunityPoolSpend => "PROPOSAL_KIND_COMMUNITY_POOL_SPEND",
-            ProposalKind::UpgradePlan => "PROPOSAL_KIND_UPGRADE_PLAN",
-            ProposalKind::FreezeIbcClient => "PROPOSAL_KIND_FREEZE_IBC_CLIENT",
-            ProposalKind::UnfreezeIbcClient => "PROPOSAL_KIND_UNFREEZE_IBC_CLIENT",
+            Self::Unspecified => "PROPOSAL_KIND_UNSPECIFIED",
+            Self::Signaling => "PROPOSAL_KIND_SIGNALING",
+            Self::Emergency => "PROPOSAL_KIND_EMERGENCY",
+            Self::ParameterChange => "PROPOSAL_KIND_PARAMETER_CHANGE",
+            Self::CommunityPoolSpend => "PROPOSAL_KIND_COMMUNITY_POOL_SPEND",
+            Self::UpgradePlan => "PROPOSAL_KIND_UPGRADE_PLAN",
+            Self::FreezeIbcClient => "PROPOSAL_KIND_FREEZE_IBC_CLIENT",
+            Self::UnfreezeIbcClient => "PROPOSAL_KIND_UNFREEZE_IBC_CLIENT",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -1393,7 +1493,13 @@ impl ProposalKind {
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query operations for the governance component.
@@ -1416,8 +1522,8 @@ pub mod query_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -1442,7 +1548,7 @@ pub mod query_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -1488,8 +1594,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1518,8 +1623,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1548,8 +1652,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1578,8 +1681,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1608,8 +1710,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1638,8 +1739,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1674,8 +1774,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1705,8 +1804,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1729,11 +1827,17 @@ pub mod query_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServiceServer.
     #[async_trait]
-    pub trait QueryService: Send + Sync + 'static {
+    pub trait QueryService: std::marker::Send + std::marker::Sync + 'static {
         async fn proposal_info(
             &self,
             request: tonic::Request<super::ProposalInfoRequest>,
@@ -1745,7 +1849,7 @@ pub mod query_service_server {
         type ProposalListStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::ProposalListResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         async fn proposal_list(
             &self,
@@ -1772,7 +1876,7 @@ pub mod query_service_server {
         type ValidatorVotesStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::ValidatorVotesResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         async fn validator_votes(
             &self,
@@ -1795,7 +1899,7 @@ pub mod query_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         async fn all_tallied_delegator_votes_for_proposal(
             &self,
@@ -1811,7 +1915,7 @@ pub mod query_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Used for computing voting power ?
         async fn proposal_rate_data(
@@ -1824,20 +1928,18 @@ pub mod query_service_server {
     }
     /// Query operations for the governance component.
     #[derive(Debug)]
-    pub struct QueryServiceServer<T: QueryService> {
-        inner: _Inner<T>,
+    pub struct QueryServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: QueryService> QueryServiceServer<T> {
+    impl<T> QueryServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -1887,8 +1989,8 @@ pub mod query_service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServiceServer<T>
     where
         T: QueryService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -1900,7 +2002,6 @@ pub mod query_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.core.component.governance.v1.QueryService/ProposalInfo" => {
                     #[allow(non_camel_case_types)]
@@ -1931,7 +2032,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ProposalInfoSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1978,7 +2078,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ProposalListSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2024,7 +2123,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ProposalDataSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2070,7 +2168,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = NextProposalIdSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2117,7 +2214,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ValidatorVotesSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2170,7 +2266,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = VotingPowerAtProposalStartSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2226,7 +2321,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AllTalliedDelegatorVotesForProposalSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2275,7 +2369,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ProposalRateDataSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2294,20 +2387,25 @@ pub mod query_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: QueryService> Clone for QueryServiceServer<T> {
+    impl<T> Clone for QueryServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -2319,17 +2417,9 @@ pub mod query_service_server {
             }
         }
     }
-    impl<T: QueryService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: QueryService> tonic::server::NamedService for QueryServiceServer<T> {
-        const NAME: &'static str = "penumbra.core.component.governance.v1.QueryService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.core.component.governance.v1.QueryService";
+    impl<T> tonic::server::NamedService for QueryServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.component.governance.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.governance.v1.serde.rs
index e5a2731256..e7467a0f7f 100644
--- a/crates/proto/src/gen/penumbra.core.component.governance.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.component.governance.v1.serde.rs
@@ -12,6 +12,7 @@ impl serde::Serialize for AllTalliedDelegatorVotesForProposalRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.AllTalliedDelegatorVotesForProposalRequest", len)?;
         if self.proposal_id != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proposalId", ToString::to_string(&self.proposal_id).as_str())?;
         }
         struct_ser.end()
@@ -1062,10 +1063,12 @@ impl serde::Serialize for DelegatorVoteBody {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.DelegatorVoteBody", len)?;
         if self.proposal != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proposal", ToString::to_string(&self.proposal).as_str())?;
         }
         if self.start_position != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startPosition", ToString::to_string(&self.start_position).as_str())?;
         }
         if let Some(v) = self.vote.as_ref() {
@@ -1273,10 +1276,12 @@ impl serde::Serialize for DelegatorVotePlan {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.DelegatorVotePlan", len)?;
         if self.proposal != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proposal", ToString::to_string(&self.proposal).as_str())?;
         }
         if self.start_position != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startPosition", ToString::to_string(&self.start_position).as_str())?;
         }
         if let Some(v) = self.vote.as_ref() {
@@ -1287,6 +1292,7 @@ impl serde::Serialize for DelegatorVotePlan {
         }
         if self.staked_note_position != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("stakedNotePosition", ToString::to_string(&self.staked_note_position).as_str())?;
         }
         if let Some(v) = self.unbonded_amount.as_ref() {
@@ -1294,14 +1300,17 @@ impl serde::Serialize for DelegatorVotePlan {
         }
         if !self.randomizer.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("randomizer", pbjson::private::base64::encode(&self.randomizer).as_str())?;
         }
         if !self.proof_blinding_r.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proofBlindingR", pbjson::private::base64::encode(&self.proof_blinding_r).as_str())?;
         }
         if !self.proof_blinding_s.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proofBlindingS", pbjson::private::base64::encode(&self.proof_blinding_s).as_str())?;
         }
         struct_ser.end()
@@ -2458,10 +2467,12 @@ impl serde::Serialize for EventProposalSubmit {
         }
         if self.start_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startHeight", ToString::to_string(&self.start_height).as_str())?;
         }
         if self.end_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("endHeight", ToString::to_string(&self.end_height).as_str())?;
         }
         struct_ser.end()
@@ -2687,6 +2698,7 @@ impl serde::Serialize for EventValidatorVote {
         }
         if self.voting_power != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("votingPower", ToString::to_string(&self.voting_power).as_str())?;
         }
         struct_ser.end()
@@ -2905,6 +2917,7 @@ impl serde::Serialize for GovernanceParameters {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.GovernanceParameters", len)?;
         if self.proposal_voting_blocks != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proposalVotingBlocks", ToString::to_string(&self.proposal_voting_blocks).as_str())?;
         }
         if let Some(v) = self.proposal_deposit_amount.as_ref() {
@@ -3136,6 +3149,7 @@ impl serde::Serialize for NextProposalIdResponse {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.NextProposalIdResponse", len)?;
         if self.next_proposal_id != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("nextProposalId", ToString::to_string(&self.next_proposal_id).as_str())?;
         }
         struct_ser.end()
@@ -3244,6 +3258,7 @@ impl serde::Serialize for Proposal {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.Proposal", len)?;
         if self.id != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("id", ToString::to_string(&self.id).as_str())?;
         }
         if !self.title.is_empty() {
@@ -4099,6 +4114,7 @@ impl serde::Serialize for proposal::UpgradePlan {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.Proposal.UpgradePlan", len)?;
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         struct_ser.end()
@@ -4197,6 +4213,7 @@ impl serde::Serialize for ProposalDataRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.ProposalDataRequest", len)?;
         if self.proposal_id != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proposalId", ToString::to_string(&self.proposal_id).as_str())?;
         }
         struct_ser.end()
@@ -4314,14 +4331,17 @@ impl serde::Serialize for ProposalDataResponse {
         }
         if self.start_block_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startBlockHeight", ToString::to_string(&self.start_block_height).as_str())?;
         }
         if self.end_block_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("endBlockHeight", ToString::to_string(&self.end_block_height).as_str())?;
         }
         if self.start_position != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startPosition", ToString::to_string(&self.start_position).as_str())?;
         }
         if let Some(v) = self.state.as_ref() {
@@ -4495,6 +4515,7 @@ impl serde::Serialize for ProposalDepositClaim {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.ProposalDepositClaim", len)?;
         if self.proposal != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proposal", ToString::to_string(&self.proposal).as_str())?;
         }
         if let Some(v) = self.deposit_amount.as_ref() {
@@ -4622,6 +4643,7 @@ impl serde::Serialize for ProposalInfoRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.ProposalInfoRequest", len)?;
         if self.proposal_id != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proposalId", ToString::to_string(&self.proposal_id).as_str())?;
         }
         struct_ser.end()
@@ -4724,10 +4746,12 @@ impl serde::Serialize for ProposalInfoResponse {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.ProposalInfoResponse", len)?;
         if self.start_block_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startBlockHeight", ToString::to_string(&self.start_block_height).as_str())?;
         }
         if self.start_position != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startPosition", ToString::to_string(&self.start_position).as_str())?;
         }
         struct_ser.end()
@@ -5040,14 +5064,17 @@ impl serde::Serialize for ProposalListResponse {
         }
         if self.start_block_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startBlockHeight", ToString::to_string(&self.start_block_height).as_str())?;
         }
         if self.end_block_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("endBlockHeight", ToString::to_string(&self.end_block_height).as_str())?;
         }
         if self.start_position != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startPosition", ToString::to_string(&self.start_position).as_str())?;
         }
         if let Some(v) = self.state.as_ref() {
@@ -5683,6 +5710,7 @@ impl serde::Serialize for ProposalRateDataRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.ProposalRateDataRequest", len)?;
         if self.proposal_id != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proposalId", ToString::to_string(&self.proposal_id).as_str())?;
         }
         struct_ser.end()
@@ -6490,6 +6518,7 @@ impl serde::Serialize for ProposalWithdraw {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.ProposalWithdraw", len)?;
         if self.proposal != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proposal", ToString::to_string(&self.proposal).as_str())?;
         }
         if !self.reason.is_empty() {
@@ -6605,10 +6634,12 @@ impl serde::Serialize for Ratio {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.Ratio", len)?;
         if self.numerator != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("numerator", ToString::to_string(&self.numerator).as_str())?;
         }
         if self.denominator != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("denominator", ToString::to_string(&self.denominator).as_str())?;
         }
         struct_ser.end()
@@ -6726,14 +6757,17 @@ impl serde::Serialize for Tally {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.Tally", len)?;
         if self.yes != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("yes", ToString::to_string(&self.yes).as_str())?;
         }
         if self.no != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("no", ToString::to_string(&self.no).as_str())?;
         }
         if self.abstain != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("abstain", ToString::to_string(&self.abstain).as_str())?;
         }
         struct_ser.end()
@@ -6983,6 +7017,7 @@ impl serde::Serialize for ValidatorVoteBody {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.ValidatorVoteBody", len)?;
         if self.proposal != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proposal", ToString::to_string(&self.proposal).as_str())?;
         }
         if let Some(v) = self.vote.as_ref() {
@@ -7234,6 +7269,7 @@ impl serde::Serialize for ValidatorVotesRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.ValidatorVotesRequest", len)?;
         if self.proposal_id != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proposalId", ToString::to_string(&self.proposal_id).as_str())?;
         }
         struct_ser.end()
@@ -7623,6 +7659,7 @@ impl serde::Serialize for VotingPowerAtProposalStartRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.VotingPowerAtProposalStartRequest", len)?;
         if self.proposal_id != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proposalId", ToString::to_string(&self.proposal_id).as_str())?;
         }
         if let Some(v) = self.identity_key.as_ref() {
@@ -7737,6 +7774,7 @@ impl serde::Serialize for VotingPowerAtProposalStartResponse {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.VotingPowerAtProposalStartResponse", len)?;
         if self.voting_power != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("votingPower", ToString::to_string(&self.voting_power).as_str())?;
         }
         struct_ser.end()
@@ -7836,6 +7874,7 @@ impl serde::Serialize for ZkDelegatorVoteProof {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.governance.v1.ZKDelegatorVoteProof", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.core.component.ibc.v1.rs b/crates/proto/src/gen/penumbra.core.component.ibc.v1.rs
index 995f53eef1..014e3feb7b 100644
--- a/crates/proto/src/gen/penumbra.core.component.ibc.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.component.ibc.v1.rs
@@ -1,4 +1,4 @@
-#[allow(clippy::derive_partial_eq_without_eq)]
+// This file is @generated by prost-build.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct IbcRelay {
     #[prost(message, optional, tag = "1")]
@@ -8,13 +8,15 @@ impl ::prost::Name for IbcRelay {
     const NAME: &'static str = "IbcRelay";
     const PACKAGE: &'static str = "penumbra.core.component.ibc.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.ibc.v1.{}", Self::NAME)
+        "penumbra.core.component.ibc.v1.IbcRelay".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.ibc.v1.IbcRelay".into()
     }
 }
 /// FungibleTokenPacketData defines a struct for the packet payload
 /// See FungibleTokenPacketData spec:
 /// <https://github.com/cosmos/ibc/tree/master/spec/app/ics-020-fungible-token-transfer#data-structures>
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct FungibleTokenPacketData {
     /// the token denomination to be transferred
@@ -37,11 +39,13 @@ impl ::prost::Name for FungibleTokenPacketData {
     const NAME: &'static str = "FungibleTokenPacketData";
     const PACKAGE: &'static str = "penumbra.core.component.ibc.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.ibc.v1.{}", Self::NAME)
+        "penumbra.core.component.ibc.v1.FungibleTokenPacketData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.ibc.v1.FungibleTokenPacketData".into()
     }
 }
 /// A Penumbra transaction action requesting an ICS20 transfer.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Ics20Withdrawal {
     #[prost(message, optional, tag = "1")]
@@ -87,10 +91,12 @@ impl ::prost::Name for Ics20Withdrawal {
     const NAME: &'static str = "Ics20Withdrawal";
     const PACKAGE: &'static str = "penumbra.core.component.ibc.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.ibc.v1.{}", Self::NAME)
+        "penumbra.core.component.ibc.v1.Ics20Withdrawal".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.ibc.v1.Ics20Withdrawal".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ClientData {
     #[prost(string, tag = "1")]
@@ -107,11 +113,13 @@ impl ::prost::Name for ClientData {
     const NAME: &'static str = "ClientData";
     const PACKAGE: &'static str = "penumbra.core.component.ibc.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.ibc.v1.{}", Self::NAME)
+        "penumbra.core.component.ibc.v1.ClientData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.ibc.v1.ClientData".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ClientCounter {
     #[prost(uint64, tag = "1")]
     pub counter: u64,
@@ -120,10 +128,12 @@ impl ::prost::Name for ClientCounter {
     const NAME: &'static str = "ClientCounter";
     const PACKAGE: &'static str = "penumbra.core.component.ibc.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.ibc.v1.{}", Self::NAME)
+        "penumbra.core.component.ibc.v1.ClientCounter".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.ibc.v1.ClientCounter".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ConsensusState {
     #[prost(message, optional, tag = "1")]
@@ -133,10 +143,12 @@ impl ::prost::Name for ConsensusState {
     const NAME: &'static str = "ConsensusState";
     const PACKAGE: &'static str = "penumbra.core.component.ibc.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.ibc.v1.{}", Self::NAME)
+        "penumbra.core.component.ibc.v1.ConsensusState".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.ibc.v1.ConsensusState".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct VerifiedHeights {
     #[prost(message, repeated, tag = "1")]
@@ -146,11 +158,13 @@ impl ::prost::Name for VerifiedHeights {
     const NAME: &'static str = "VerifiedHeights";
     const PACKAGE: &'static str = "penumbra.core.component.ibc.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.ibc.v1.{}", Self::NAME)
+        "penumbra.core.component.ibc.v1.VerifiedHeights".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.ibc.v1.VerifiedHeights".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ConnectionCounter {
     #[prost(uint64, tag = "1")]
     pub counter: u64,
@@ -159,10 +173,12 @@ impl ::prost::Name for ConnectionCounter {
     const NAME: &'static str = "ConnectionCounter";
     const PACKAGE: &'static str = "penumbra.core.component.ibc.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.ibc.v1.{}", Self::NAME)
+        "penumbra.core.component.ibc.v1.ConnectionCounter".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.ibc.v1.ConnectionCounter".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ClientConnections {
     #[prost(string, repeated, tag = "1")]
@@ -172,12 +188,14 @@ impl ::prost::Name for ClientConnections {
     const NAME: &'static str = "ClientConnections";
     const PACKAGE: &'static str = "penumbra.core.component.ibc.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.ibc.v1.{}", Self::NAME)
+        "penumbra.core.component.ibc.v1.ClientConnections".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.ibc.v1.ClientConnections".into()
     }
 }
 /// IBC configuration data.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct IbcParameters {
     /// Whether IBC (forming connections, processing IBC packets) is enabled.
     #[prost(bool, tag = "1")]
@@ -193,12 +211,14 @@ impl ::prost::Name for IbcParameters {
     const NAME: &'static str = "IbcParameters";
     const PACKAGE: &'static str = "penumbra.core.component.ibc.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.ibc.v1.{}", Self::NAME)
+        "penumbra.core.component.ibc.v1.IbcParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.ibc.v1.IbcParameters".into()
     }
 }
 /// IBC genesis state.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct GenesisContent {
     /// IBC parameters.
     #[prost(message, optional, tag = "1")]
@@ -208,6 +228,9 @@ impl ::prost::Name for GenesisContent {
     const NAME: &'static str = "GenesisContent";
     const PACKAGE: &'static str = "penumbra.core.component.ibc.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.ibc.v1.{}", Self::NAME)
+        "penumbra.core.component.ibc.v1.GenesisContent".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.ibc.v1.GenesisContent".into()
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.component.ibc.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.ibc.v1.serde.rs
index 846d45e6c9..e610db1c7a 100644
--- a/crates/proto/src/gen/penumbra.core.component.ibc.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.component.ibc.v1.serde.rs
@@ -107,6 +107,7 @@ impl serde::Serialize for ClientCounter {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.ibc.v1.ClientCounter", len)?;
         if self.counter != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("counter", ToString::to_string(&self.counter).as_str())?;
         }
         struct_ser.end()
@@ -223,6 +224,7 @@ impl serde::Serialize for ClientData {
         }
         if self.processed_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("processedHeight", ToString::to_string(&self.processed_height).as_str())?;
         }
         struct_ser.end()
@@ -358,6 +360,7 @@ impl serde::Serialize for ConnectionCounter {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.ibc.v1.ConnectionCounter", len)?;
         if self.counter != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("counter", ToString::to_string(&self.counter).as_str())?;
         }
         struct_ser.end()
@@ -1081,6 +1084,7 @@ impl serde::Serialize for Ics20Withdrawal {
         }
         if self.timeout_time != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("timeoutTime", ToString::to_string(&self.timeout_time).as_str())?;
         }
         if !self.source_channel.is_empty() {
diff --git a/crates/proto/src/gen/penumbra.core.component.sct.v1.rs b/crates/proto/src/gen/penumbra.core.component.sct.v1.rs
index 24724a4047..3d111b51d0 100644
--- a/crates/proto/src/gen/penumbra.core.component.sct.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.component.sct.v1.rs
@@ -1,6 +1,6 @@
+// This file is @generated by prost-build.
 /// Configuration data for the SCT component.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct SctParameters {
     /// The default duration of each epoch, in number of blocks.
     #[prost(uint64, tag = "1")]
@@ -10,12 +10,14 @@ impl ::prost::Name for SctParameters {
     const NAME: &'static str = "SctParameters";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.SctParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.SctParameters".into()
     }
 }
 /// Sct-specific genesis content.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct GenesisContent {
     /// The SctParameters present at genesis.
     #[prost(message, optional, tag = "1")]
@@ -25,12 +27,14 @@ impl ::prost::Name for GenesisContent {
     const NAME: &'static str = "GenesisContent";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.GenesisContent".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.GenesisContent".into()
     }
 }
 /// An epoch is a sequentially numbered collection of contiguous blocks.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct Epoch {
     /// The unique index of the epoch.
     #[prost(uint64, tag = "1")]
@@ -43,14 +47,16 @@ impl ::prost::Name for Epoch {
     const NAME: &'static str = "Epoch";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.Epoch".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.Epoch".into()
     }
 }
 /// Metadata describing the source of a commitment in the state commitment tree.
 ///
 /// This message allows clients to track provenance of state commitments, and to
 /// decide whether or not to download block data.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CommitmentSource {
     #[prost(oneof = "commitment_source::Source", tags = "1, 2, 20, 30, 40")]
@@ -59,16 +65,16 @@ pub struct CommitmentSource {
 /// Nested message and enum types in `CommitmentSource`.
 pub mod commitment_source {
     /// The state commitment was included in the genesis state.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct Genesis {}
     impl ::prost::Name for Genesis {
         const NAME: &'static str = "Genesis";
         const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.sct.v1.CommitmentSource.{}", Self::NAME
-            )
+            "penumbra.core.component.sct.v1.CommitmentSource.Genesis".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.sct.v1.CommitmentSource.Genesis".into()
         }
     }
     /// The commitment was created by a transaction.
@@ -76,7 +82,6 @@ pub mod commitment_source {
     /// When included in a `CompactBlock` via a `StatePayload`, the transaction source is "dehydrated"
     /// by stripping the `id` field and putting empty bytes in its place.  When clients perform extended
     /// transaction fetch, they should match up transaction hashes to "rehydrate" the source info.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Transaction {
         /// The transaction ID, if specified.
@@ -90,14 +95,14 @@ pub mod commitment_source {
         const NAME: &'static str = "Transaction";
         const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.sct.v1.CommitmentSource.{}", Self::NAME
-            )
+            "penumbra.core.component.sct.v1.CommitmentSource.Transaction".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.sct.v1.CommitmentSource.Transaction".into()
         }
     }
     /// The commitment was created through a validator's funding stream.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct FundingStreamReward {
         /// The epoch index the rewards were issued in.
         #[prost(uint64, tag = "1")]
@@ -107,26 +112,26 @@ pub mod commitment_source {
         const NAME: &'static str = "FundingStreamReward";
         const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.sct.v1.CommitmentSource.{}", Self::NAME
-            )
+            "penumbra.core.component.sct.v1.CommitmentSource.FundingStreamReward".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.sct.v1.CommitmentSource.FundingStreamReward".into()
         }
     }
     /// The commitment was created through a `CommunityPoolOutput` in a governance-initated transaction.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct CommunityPoolOutput {}
     impl ::prost::Name for CommunityPoolOutput {
         const NAME: &'static str = "CommunityPoolOutput";
         const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.sct.v1.CommitmentSource.{}", Self::NAME
-            )
+            "penumbra.core.component.sct.v1.CommitmentSource.CommunityPoolOutput".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.sct.v1.CommitmentSource.CommunityPoolOutput".into()
         }
     }
     /// The commitment was created by an inbound ICS20 transfer.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Ics20Transfer {
         /// The sequence number of the packet that triggered the transfer
@@ -143,12 +148,12 @@ pub mod commitment_source {
         const NAME: &'static str = "Ics20Transfer";
         const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.sct.v1.CommitmentSource.{}", Self::NAME
-            )
+            "penumbra.core.component.sct.v1.CommitmentSource.Ics20Transfer".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.sct.v1.CommitmentSource.Ics20Transfer".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Source {
         #[prost(message, tag = "1")]
@@ -167,10 +172,12 @@ impl ::prost::Name for CommitmentSource {
     const NAME: &'static str = "CommitmentSource";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.CommitmentSource".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.CommitmentSource".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Nullifier {
     #[prost(bytes = "vec", tag = "1")]
@@ -180,11 +187,13 @@ impl ::prost::Name for Nullifier {
     const NAME: &'static str = "Nullifier";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.Nullifier".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.Nullifier".into()
     }
 }
 /// Records information about what transaction spent a nullifier.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NullificationInfo {
     #[prost(bytes = "vec", tag = "1")]
@@ -196,11 +205,13 @@ impl ::prost::Name for NullificationInfo {
     const NAME: &'static str = "NullificationInfo";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.NullificationInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.NullificationInfo".into()
     }
 }
 /// Event recording a new commitment added to the SCT.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventCommitment {
     #[prost(message, optional, tag = "1")]
@@ -216,11 +227,13 @@ impl ::prost::Name for EventCommitment {
     const NAME: &'static str = "EventCommitment";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.EventCommitment".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.EventCommitment".into()
     }
 }
 /// Event recording an SCT anchor (global root).
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventAnchor {
     #[prost(message, optional, tag = "1")]
@@ -236,11 +249,13 @@ impl ::prost::Name for EventAnchor {
     const NAME: &'static str = "EventAnchor";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.EventAnchor".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.EventAnchor".into()
     }
 }
 /// Event recording an SCT epoch root.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventEpochRoot {
     #[prost(message, optional, tag = "1")]
@@ -256,11 +271,13 @@ impl ::prost::Name for EventEpochRoot {
     const NAME: &'static str = "EventEpochRoot";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.EventEpochRoot".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.EventEpochRoot".into()
     }
 }
 /// Event recording an SCT block root.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventBlockRoot {
     #[prost(message, optional, tag = "1")]
@@ -276,11 +293,13 @@ impl ::prost::Name for EventBlockRoot {
     const NAME: &'static str = "EventBlockRoot";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.EventBlockRoot".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.EventBlockRoot".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct EpochByHeightRequest {
     #[prost(uint64, tag = "1")]
     pub height: u64,
@@ -289,11 +308,13 @@ impl ::prost::Name for EpochByHeightRequest {
     const NAME: &'static str = "EpochByHeightRequest";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.EpochByHeightRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.EpochByHeightRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct EpochByHeightResponse {
     #[prost(message, optional, tag = "1")]
     pub epoch: ::core::option::Option<Epoch>,
@@ -302,11 +323,13 @@ impl ::prost::Name for EpochByHeightResponse {
     const NAME: &'static str = "EpochByHeightResponse";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.EpochByHeightResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.EpochByHeightResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct AnchorByHeightRequest {
     #[prost(uint64, tag = "1")]
     pub height: u64,
@@ -315,10 +338,12 @@ impl ::prost::Name for AnchorByHeightRequest {
     const NAME: &'static str = "AnchorByHeightRequest";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.AnchorByHeightRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.AnchorByHeightRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AnchorByHeightResponse {
     #[prost(message, optional, tag = "1")]
@@ -330,11 +355,13 @@ impl ::prost::Name for AnchorByHeightResponse {
     const NAME: &'static str = "AnchorByHeightResponse";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.AnchorByHeightResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.AnchorByHeightResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct TimestampByHeightRequest {
     #[prost(uint64, tag = "1")]
     pub height: u64,
@@ -343,11 +370,13 @@ impl ::prost::Name for TimestampByHeightRequest {
     const NAME: &'static str = "TimestampByHeightRequest";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.TimestampByHeightRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.TimestampByHeightRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct TimestampByHeightResponse {
     #[prost(message, optional, tag = "1")]
     pub timestamp: ::core::option::Option<::pbjson_types::Timestamp>,
@@ -356,13 +385,22 @@ impl ::prost::Name for TimestampByHeightResponse {
     const NAME: &'static str = "TimestampByHeightResponse";
     const PACKAGE: &'static str = "penumbra.core.component.sct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.sct.v1.{}", Self::NAME)
+        "penumbra.core.component.sct.v1.TimestampByHeightResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.sct.v1.TimestampByHeightResponse".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query operations for the SCT component.
@@ -385,8 +423,8 @@ pub mod query_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -411,7 +449,7 @@ pub mod query_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -457,8 +495,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -487,8 +524,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -517,8 +553,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -541,11 +576,17 @@ pub mod query_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServiceServer.
     #[async_trait]
-    pub trait QueryService: Send + Sync + 'static {
+    pub trait QueryService: std::marker::Send + std::marker::Sync + 'static {
         async fn anchor_by_height(
             &self,
             request: tonic::Request<super::AnchorByHeightRequest>,
@@ -570,20 +611,18 @@ pub mod query_service_server {
     }
     /// Query operations for the SCT component.
     #[derive(Debug)]
-    pub struct QueryServiceServer<T: QueryService> {
-        inner: _Inner<T>,
+    pub struct QueryServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: QueryService> QueryServiceServer<T> {
+    impl<T> QueryServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -633,8 +672,8 @@ pub mod query_service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServiceServer<T>
     where
         T: QueryService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -646,7 +685,6 @@ pub mod query_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.core.component.sct.v1.QueryService/AnchorByHeight" => {
                     #[allow(non_camel_case_types)]
@@ -677,7 +715,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AnchorByHeightSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -723,7 +760,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = EpochByHeightSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -770,7 +806,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = TimestampByHeightSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -789,20 +824,25 @@ pub mod query_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: QueryService> Clone for QueryServiceServer<T> {
+    impl<T> Clone for QueryServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -814,17 +854,9 @@ pub mod query_service_server {
             }
         }
     }
-    impl<T: QueryService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: QueryService> tonic::server::NamedService for QueryServiceServer<T> {
-        const NAME: &'static str = "penumbra.core.component.sct.v1.QueryService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.core.component.sct.v1.QueryService";
+    impl<T> tonic::server::NamedService for QueryServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.component.sct.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.sct.v1.serde.rs
index 773dcedfea..064ca3d29f 100644
--- a/crates/proto/src/gen/penumbra.core.component.sct.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.component.sct.v1.serde.rs
@@ -12,6 +12,7 @@ impl serde::Serialize for AnchorByHeightRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.sct.v1.AnchorByHeightRequest", len)?;
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         struct_ser.end()
@@ -432,6 +433,7 @@ impl serde::Serialize for commitment_source::FundingStreamReward {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.sct.v1.CommitmentSource.FundingStreamReward", len)?;
         if self.epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("epochIndex", ToString::to_string(&self.epoch_index).as_str())?;
         }
         struct_ser.end()
@@ -609,6 +611,7 @@ impl serde::Serialize for commitment_source::Ics20Transfer {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.sct.v1.CommitmentSource.Ics20Transfer", len)?;
         if self.packet_seq != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("packetSeq", ToString::to_string(&self.packet_seq).as_str())?;
         }
         if !self.channel_id.is_empty() {
@@ -737,6 +740,7 @@ impl serde::Serialize for commitment_source::Transaction {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.sct.v1.CommitmentSource.Transaction", len)?;
         if !self.id.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("id", pbjson::private::base64::encode(&self.id).as_str())?;
         }
         struct_ser.end()
@@ -838,10 +842,12 @@ impl serde::Serialize for Epoch {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.sct.v1.Epoch", len)?;
         if self.index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("index", ToString::to_string(&self.index).as_str())?;
         }
         if self.start_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startHeight", ToString::to_string(&self.start_height).as_str())?;
         }
         struct_ser.end()
@@ -954,6 +960,7 @@ impl serde::Serialize for EpochByHeightRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.sct.v1.EpochByHeightRequest", len)?;
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         struct_ser.end()
@@ -1156,6 +1163,7 @@ impl serde::Serialize for EventAnchor {
         }
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         if let Some(v) = self.timestamp.as_ref() {
@@ -1288,6 +1296,7 @@ impl serde::Serialize for EventBlockRoot {
         }
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         if let Some(v) = self.timestamp.as_ref() {
@@ -1420,6 +1429,7 @@ impl serde::Serialize for EventCommitment {
         }
         if self.position != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("position", ToString::to_string(&self.position).as_str())?;
         }
         if let Some(v) = self.source.as_ref() {
@@ -1552,6 +1562,7 @@ impl serde::Serialize for EventEpochRoot {
         }
         if self.index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("index", ToString::to_string(&self.index).as_str())?;
         }
         if let Some(v) = self.timestamp.as_ref() {
@@ -1774,10 +1785,12 @@ impl serde::Serialize for NullificationInfo {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.sct.v1.NullificationInfo", len)?;
         if !self.id.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("id", pbjson::private::base64::encode(&self.id).as_str())?;
         }
         if self.spend_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("spendHeight", ToString::to_string(&self.spend_height).as_str())?;
         }
         struct_ser.end()
@@ -1890,6 +1903,7 @@ impl serde::Serialize for Nullifier {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.sct.v1.Nullifier", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -1988,6 +2002,7 @@ impl serde::Serialize for SctParameters {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.sct.v1.SctParameters", len)?;
         if self.epoch_duration != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("epochDuration", ToString::to_string(&self.epoch_duration).as_str())?;
         }
         struct_ser.end()
@@ -2087,6 +2102,7 @@ impl serde::Serialize for TimestampByHeightRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.sct.v1.TimestampByHeightRequest", len)?;
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.rs b/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.rs
index e287e3e5e6..a0170d3e98 100644
--- a/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.rs
@@ -1,6 +1,6 @@
+// This file is @generated by prost-build.
 /// Configuration data for the shielded pool component.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ShieldedPoolParameters {
     #[deprecated]
     #[prost(message, optional, tag = "1")]
@@ -12,13 +12,13 @@ impl ::prost::Name for ShieldedPoolParameters {
     const NAME: &'static str = "ShieldedPoolParameters";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.ShieldedPoolParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.ShieldedPoolParameters".into()
     }
 }
 /// Genesis data for the shielded pool component.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GenesisContent {
     #[prost(message, optional, tag = "1")]
@@ -29,7 +29,6 @@ pub struct GenesisContent {
 }
 /// Nested message and enum types in `GenesisContent`.
 pub mod genesis_content {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Allocation {
         #[prost(message, optional, tag = "1")]
@@ -45,9 +44,10 @@ pub mod genesis_content {
         const NAME: &'static str = "Allocation";
         const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.shielded_pool.v1.GenesisContent.{}", Self::NAME
-            )
+            "penumbra.core.component.shielded_pool.v1.GenesisContent.Allocation".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.shielded_pool.v1.GenesisContent.Allocation".into()
         }
     }
 }
@@ -55,14 +55,14 @@ impl ::prost::Name for GenesisContent {
     const NAME: &'static str = "GenesisContent";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.GenesisContent".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.GenesisContent".into()
     }
 }
 /// The parameters which control how the FMD parameters evolve over time.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct FmdMetaParameters {
     /// How much time users have to transition to new parameters.
     #[prost(uint64, tag = "1")]
@@ -74,8 +74,7 @@ pub struct FmdMetaParameters {
 /// Nested message and enum types in `FmdMetaParameters`.
 pub mod fmd_meta_parameters {
     /// A sliding window algorithm for updating the parameters.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct AlgorithmSlidingWindow {
         /// The window size, in terms of the number of update periods.
         ///
@@ -90,15 +89,16 @@ pub mod fmd_meta_parameters {
         const NAME: &'static str = "AlgorithmSlidingWindow";
         const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.shielded_pool.v1.FmdMetaParameters.{}",
-                Self::NAME
-            )
+            "penumbra.core.component.shielded_pool.v1.FmdMetaParameters.AlgorithmSlidingWindow"
+                .into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.shielded_pool.v1.FmdMetaParameters.AlgorithmSlidingWindow"
+                .into()
         }
     }
     /// The algorithm governing how the parameters change.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
     pub enum Algorithm {
         #[prost(uint32, tag = "2")]
         FixedPrecisionBits(u32),
@@ -110,14 +110,14 @@ impl ::prost::Name for FmdMetaParameters {
     const NAME: &'static str = "FmdMetaParameters";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.FmdMetaParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.FmdMetaParameters".into()
     }
 }
 /// Used to potentially store state for the FMD Meta Parameters algorithm.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct FmdMetaParametersAlgorithmState {
     #[prost(oneof = "fmd_meta_parameters_algorithm_state::State", tags = "1, 2")]
     pub state: ::core::option::Option<fmd_meta_parameters_algorithm_state::State>,
@@ -125,22 +125,22 @@ pub struct FmdMetaParametersAlgorithmState {
 /// Nested message and enum types in `FmdMetaParametersAlgorithmState`.
 pub mod fmd_meta_parameters_algorithm_state {
     /// The state used for the fixed algorithm.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct FixedState {}
     impl ::prost::Name for FixedState {
         const NAME: &'static str = "FixedState";
         const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.shielded_pool.v1.FmdMetaParametersAlgorithmState.{}",
-                Self::NAME
-            )
+            "penumbra.core.component.shielded_pool.v1.FmdMetaParametersAlgorithmState.FixedState"
+                .into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.shielded_pool.v1.FmdMetaParametersAlgorithmState.FixedState"
+                .into()
         }
     }
     /// The state used for the sliding window algorithm.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct SlidingWindowState {
         /// The number of clues previously observed, approximately.
         #[prost(uint32, tag = "1")]
@@ -150,14 +150,15 @@ pub mod fmd_meta_parameters_algorithm_state {
         const NAME: &'static str = "SlidingWindowState";
         const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.shielded_pool.v1.FmdMetaParametersAlgorithmState.{}",
-                Self::NAME
-            )
+            "penumbra.core.component.shielded_pool.v1.FmdMetaParametersAlgorithmState.SlidingWindowState"
+                .into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.shielded_pool.v1.FmdMetaParametersAlgorithmState.SlidingWindowState"
+                .into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
     pub enum State {
         #[prost(message, tag = "1")]
         Fixed(FixedState),
@@ -169,14 +170,15 @@ impl ::prost::Name for FmdMetaParametersAlgorithmState {
     const NAME: &'static str = "FmdMetaParametersAlgorithmState";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.FmdMetaParametersAlgorithmState".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.FmdMetaParametersAlgorithmState"
+            .into()
     }
 }
 /// Parameters for Fuzzy Message Detection
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct FmdParameters {
     #[prost(uint32, tag = "1")]
     pub precision_bits: u32,
@@ -187,12 +189,12 @@ impl ::prost::Name for FmdParameters {
     const NAME: &'static str = "FmdParameters";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.FmdParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.FmdParameters".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Note {
     #[prost(message, optional, tag = "1")]
@@ -206,12 +208,12 @@ impl ::prost::Name for Note {
     const NAME: &'static str = "Note";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.Note".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.Note".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NoteView {
     #[prost(message, optional, tag = "1")]
@@ -225,14 +227,14 @@ impl ::prost::Name for NoteView {
     const NAME: &'static str = "NoteView";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.NoteView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.NoteView".into()
     }
 }
 /// An encrypted note.
 /// 176 = 80(address) + 16(amount) + 32(asset ID) + 32(rseed) + 16(MAC) bytes.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NoteCiphertext {
     #[prost(bytes = "vec", tag = "1")]
@@ -242,14 +244,14 @@ impl ::prost::Name for NoteCiphertext {
     const NAME: &'static str = "NoteCiphertext";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.NoteCiphertext".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.NoteCiphertext".into()
     }
 }
 /// The body of an output description, including only the minimal
 /// data required to scan and process the output.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NotePayload {
     /// The note commitment for the output note. 32 bytes.
@@ -269,13 +271,13 @@ impl ::prost::Name for NotePayload {
     const NAME: &'static str = "NotePayload";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.NotePayload".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.NotePayload".into()
     }
 }
 /// A Penumbra ZK output proof.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ZkOutputProof {
     #[prost(bytes = "vec", tag = "1")]
@@ -285,13 +287,13 @@ impl ::prost::Name for ZkOutputProof {
     const NAME: &'static str = "ZKOutputProof";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.ZKOutputProof".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.ZKOutputProof".into()
     }
 }
 /// A Penumbra ZK spend proof.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ZkSpendProof {
     #[prost(bytes = "vec", tag = "1")]
@@ -301,13 +303,13 @@ impl ::prost::Name for ZkSpendProof {
     const NAME: &'static str = "ZKSpendProof";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.ZKSpendProof".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.ZKSpendProof".into()
     }
 }
 /// A Penumbra ZK nullifier derivation proof.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ZkNullifierDerivationProof {
     #[prost(bytes = "vec", tag = "1")]
@@ -317,13 +319,13 @@ impl ::prost::Name for ZkNullifierDerivationProof {
     const NAME: &'static str = "ZKNullifierDerivationProof";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.ZKNullifierDerivationProof".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.ZKNullifierDerivationProof".into()
     }
 }
 /// Spends a shielded note.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Spend {
     /// The effecting data of the spend.
@@ -342,13 +344,13 @@ impl ::prost::Name for Spend {
     const NAME: &'static str = "Spend";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.Spend".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.Spend".into()
     }
 }
 /// ABCI Event recording a spend.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventSpend {
     #[prost(message, optional, tag = "1")]
@@ -358,13 +360,13 @@ impl ::prost::Name for EventSpend {
     const NAME: &'static str = "EventSpend";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.EventSpend".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.EventSpend".into()
     }
 }
 /// ABCI Event recording an output.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventOutput {
     #[prost(message, optional, tag = "1")]
@@ -376,13 +378,13 @@ impl ::prost::Name for EventOutput {
     const NAME: &'static str = "EventOutput";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.EventOutput".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.EventOutput".into()
     }
 }
 /// ABCI Event recording a clue.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventBroadcastClue {
     #[prost(message, optional, tag = "1")]
@@ -396,15 +398,15 @@ impl ::prost::Name for EventBroadcastClue {
     const NAME: &'static str = "EventBroadcastClue";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.EventBroadcastClue".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.EventBroadcastClue".into()
     }
 }
 /// The body of a spend description, containing only the effecting data
 /// describing changes to the ledger, and not the authorizing data that allows
 /// those changes to be performed.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SpendBody {
     /// A commitment to the value of the input note.
@@ -428,12 +430,12 @@ impl ::prost::Name for SpendBody {
     const NAME: &'static str = "SpendBody";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.SpendBody".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.SpendBody".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SpendView {
     #[prost(oneof = "spend_view::SpendView", tags = "1, 2")]
@@ -441,7 +443,6 @@ pub struct SpendView {
 }
 /// Nested message and enum types in `SpendView`.
 pub mod spend_view {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Visible {
         #[prost(message, optional, tag = "1")]
@@ -453,12 +454,12 @@ pub mod spend_view {
         const NAME: &'static str = "Visible";
         const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.shielded_pool.v1.SpendView.{}", Self::NAME
-            )
+            "penumbra.core.component.shielded_pool.v1.SpendView.Visible".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.shielded_pool.v1.SpendView.Visible".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Opaque {
         #[prost(message, optional, tag = "1")]
@@ -468,12 +469,12 @@ pub mod spend_view {
         const NAME: &'static str = "Opaque";
         const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.shielded_pool.v1.SpendView.{}", Self::NAME
-            )
+            "penumbra.core.component.shielded_pool.v1.SpendView.Opaque".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.shielded_pool.v1.SpendView.Opaque".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum SpendView {
         #[prost(message, tag = "1")]
@@ -486,12 +487,12 @@ impl ::prost::Name for SpendView {
     const NAME: &'static str = "SpendView";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.SpendView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.SpendView".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SpendPlan {
     /// The plaintext note we plan to spend.
@@ -517,13 +518,13 @@ impl ::prost::Name for SpendPlan {
     const NAME: &'static str = "SpendPlan";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.SpendPlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.SpendPlan".into()
     }
 }
 /// Creates a new shielded note.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Output {
     /// The effecting data for the output.
@@ -537,15 +538,15 @@ impl ::prost::Name for Output {
     const NAME: &'static str = "Output";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.Output".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.Output".into()
     }
 }
 /// The body of an output description, containing only the effecting data
 /// describing changes to the ledger, and not the authorizing data that allows
 /// those changes to be performed.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct OutputBody {
     /// The minimal data required to scan and process the new output note.
@@ -568,12 +569,12 @@ impl ::prost::Name for OutputBody {
     const NAME: &'static str = "OutputBody";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.OutputBody".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.OutputBody".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct OutputView {
     #[prost(oneof = "output_view::OutputView", tags = "1, 2")]
@@ -581,7 +582,6 @@ pub struct OutputView {
 }
 /// Nested message and enum types in `OutputView`.
 pub mod output_view {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Visible {
         #[prost(message, optional, tag = "1")]
@@ -597,12 +597,12 @@ pub mod output_view {
         const NAME: &'static str = "Visible";
         const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.shielded_pool.v1.OutputView.{}", Self::NAME
-            )
+            "penumbra.core.component.shielded_pool.v1.OutputView.Visible".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.shielded_pool.v1.OutputView.Visible".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Opaque {
         #[prost(message, optional, tag = "1")]
@@ -612,12 +612,12 @@ pub mod output_view {
         const NAME: &'static str = "Opaque";
         const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.shielded_pool.v1.OutputView.{}", Self::NAME
-            )
+            "penumbra.core.component.shielded_pool.v1.OutputView.Opaque".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.shielded_pool.v1.OutputView.Opaque".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum OutputView {
         #[prost(message, tag = "1")]
@@ -630,12 +630,12 @@ impl ::prost::Name for OutputView {
     const NAME: &'static str = "OutputView";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.OutputView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.OutputView".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct OutputPlan {
     /// The value to send to this output.
@@ -661,13 +661,13 @@ impl ::prost::Name for OutputPlan {
     const NAME: &'static str = "OutputPlan";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.OutputPlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.OutputPlan".into()
     }
 }
 /// Requests information on an asset by asset id
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AssetMetadataByIdRequest {
     /// The asset id to request information on.
@@ -678,12 +678,12 @@ impl ::prost::Name for AssetMetadataByIdRequest {
     const NAME: &'static str = "AssetMetadataByIdRequest";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.AssetMetadataByIdRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.AssetMetadataByIdRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AssetMetadataByIdResponse {
     /// If present, information on the requested asset.
@@ -696,13 +696,13 @@ impl ::prost::Name for AssetMetadataByIdResponse {
     const NAME: &'static str = "AssetMetadataByIdResponse";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.AssetMetadataByIdResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.AssetMetadataByIdResponse".into()
     }
 }
 /// Requests information on an asset by multiple asset ids
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AssetMetadataByIdsRequest {
     /// The asset IDs to request information on. Note that node is neither required
@@ -714,12 +714,12 @@ impl ::prost::Name for AssetMetadataByIdsRequest {
     const NAME: &'static str = "AssetMetadataByIdsRequest";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.AssetMetadataByIdsRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.AssetMetadataByIdsRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AssetMetadataByIdsResponse {
     /// A single asset metadata streamed from the node.
@@ -730,16 +730,16 @@ impl ::prost::Name for AssetMetadataByIdsResponse {
     const NAME: &'static str = "AssetMetadataByIdsResponse";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.AssetMetadataByIdsResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.AssetMetadataByIdsResponse".into()
     }
 }
 /// Metadata about the packet associated with the transfer.
 ///
 /// This allows identifying which specific packet is associated with the transfer.
 /// Implicitly, both ports are going to be "transfer".
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct FungibleTokenTransferPacketMetadata {
     /// The identifier for the channel on *this* chain.
@@ -753,12 +753,14 @@ impl ::prost::Name for FungibleTokenTransferPacketMetadata {
     const NAME: &'static str = "FungibleTokenTransferPacketMetadata";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.FungibleTokenTransferPacketMetadata"
+            .into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.FungibleTokenTransferPacketMetadata"
+            .into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventOutboundFungibleTokenTransfer {
     /// The value being transferred out of the chain.
@@ -777,12 +779,14 @@ impl ::prost::Name for EventOutboundFungibleTokenTransfer {
     const NAME: &'static str = "EventOutboundFungibleTokenTransfer";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.EventOutboundFungibleTokenTransfer"
+            .into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.EventOutboundFungibleTokenTransfer"
+            .into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventOutboundFungibleTokenRefund {
     /// The value being refunded.
@@ -832,9 +836,9 @@ pub mod event_outbound_fungible_token_refund {
         /// (if the ProtoBuf definition does not change) and safe for programmatic use.
         pub fn as_str_name(&self) -> &'static str {
             match self {
-                Reason::Unspecified => "REASON_UNSPECIFIED",
-                Reason::Timeout => "REASON_TIMEOUT",
-                Reason::Error => "REASON_ERROR",
+                Self::Unspecified => "REASON_UNSPECIFIED",
+                Self::Timeout => "REASON_TIMEOUT",
+                Self::Error => "REASON_ERROR",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.
@@ -852,12 +856,14 @@ impl ::prost::Name for EventOutboundFungibleTokenRefund {
     const NAME: &'static str = "EventOutboundFungibleTokenRefund";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.EventOutboundFungibleTokenRefund"
+            .into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.EventOutboundFungibleTokenRefund"
+            .into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventInboundFungibleTokenTransfer {
     /// The value being transferred in.
@@ -876,15 +882,24 @@ impl ::prost::Name for EventInboundFungibleTokenTransfer {
     const NAME: &'static str = "EventInboundFungibleTokenTransfer";
     const PACKAGE: &'static str = "penumbra.core.component.shielded_pool.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!(
-            "penumbra.core.component.shielded_pool.v1.{}", Self::NAME
-        )
+        "penumbra.core.component.shielded_pool.v1.EventInboundFungibleTokenTransfer"
+            .into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.shielded_pool.v1.EventInboundFungibleTokenTransfer"
+            .into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query operations for the shielded pool component.
@@ -907,8 +922,8 @@ pub mod query_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -933,7 +948,7 @@ pub mod query_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -979,8 +994,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1014,8 +1028,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1038,11 +1051,17 @@ pub mod query_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServiceServer.
     #[async_trait]
-    pub trait QueryService: Send + Sync + 'static {
+    pub trait QueryService: std::marker::Send + std::marker::Sync + 'static {
         async fn asset_metadata_by_id(
             &self,
             request: tonic::Request<super::AssetMetadataByIdRequest>,
@@ -1057,7 +1076,7 @@ pub mod query_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Requests a stream of asset metadata, given an array of asset IDs. Responses
         /// may be streamed in a different order from that of the asset IDs in the
@@ -1074,20 +1093,18 @@ pub mod query_service_server {
     }
     /// Query operations for the shielded pool component.
     #[derive(Debug)]
-    pub struct QueryServiceServer<T: QueryService> {
-        inner: _Inner<T>,
+    pub struct QueryServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: QueryService> QueryServiceServer<T> {
+    impl<T> QueryServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -1137,8 +1154,8 @@ pub mod query_service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServiceServer<T>
     where
         T: QueryService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -1150,7 +1167,6 @@ pub mod query_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.core.component.shielded_pool.v1.QueryService/AssetMetadataById" => {
                     #[allow(non_camel_case_types)]
@@ -1182,7 +1198,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AssetMetadataByIdSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1231,7 +1246,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AssetMetadataByIdsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1250,20 +1264,25 @@ pub mod query_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: QueryService> Clone for QueryServiceServer<T> {
+    impl<T> Clone for QueryServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -1275,17 +1294,9 @@ pub mod query_service_server {
             }
         }
     }
-    impl<T: QueryService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: QueryService> tonic::server::NamedService for QueryServiceServer<T> {
-        const NAME: &'static str = "penumbra.core.component.shielded_pool.v1.QueryService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.core.component.shielded_pool.v1.QueryService";
+    impl<T> tonic::server::NamedService for QueryServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.serde.rs
index c77243e1d0..856dab92e1 100644
--- a/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.serde.rs
@@ -1233,6 +1233,7 @@ impl serde::Serialize for FmdMetaParameters {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.shielded_pool.v1.FmdMetaParameters", len)?;
         if self.fmd_grace_period_blocks != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("fmdGracePeriodBlocks", ToString::to_string(&self.fmd_grace_period_blocks).as_str())?;
         }
         if let Some(v) = self.algorithm.as_ref() {
@@ -1773,6 +1774,7 @@ impl serde::Serialize for FmdParameters {
         }
         if self.as_of_block_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("asOfBlockHeight", ToString::to_string(&self.as_of_block_height).as_str())?;
         }
         struct_ser.end()
@@ -1892,6 +1894,7 @@ impl serde::Serialize for FungibleTokenTransferPacketMetadata {
         }
         if self.sequence != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("sequence", ToString::to_string(&self.sequence).as_str())?;
         }
         struct_ser.end()
@@ -2252,6 +2255,7 @@ impl serde::Serialize for Note {
         }
         if !self.rseed.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("rseed", pbjson::private::base64::encode(&self.rseed).as_str())?;
         }
         if let Some(v) = self.address.as_ref() {
@@ -2375,6 +2379,7 @@ impl serde::Serialize for NoteCiphertext {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.shielded_pool.v1.NoteCiphertext", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -2482,6 +2487,7 @@ impl serde::Serialize for NotePayload {
         }
         if !self.ephemeral_key.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("ephemeralKey", pbjson::private::base64::encode(&self.ephemeral_key).as_str())?;
         }
         if let Some(v) = self.encrypted_note.as_ref() {
@@ -2617,6 +2623,7 @@ impl serde::Serialize for NoteView {
         }
         if !self.rseed.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("rseed", pbjson::private::base64::encode(&self.rseed).as_str())?;
         }
         if let Some(v) = self.address.as_ref() {
@@ -2867,10 +2874,12 @@ impl serde::Serialize for OutputBody {
         }
         if !self.wrapped_memo_key.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("wrappedMemoKey", pbjson::private::base64::encode(&self.wrapped_memo_key).as_str())?;
         }
         if !self.ovk_wrapped_key.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("ovkWrappedKey", pbjson::private::base64::encode(&self.ovk_wrapped_key).as_str())?;
         }
         struct_ser.end()
@@ -3029,18 +3038,22 @@ impl serde::Serialize for OutputPlan {
         }
         if !self.rseed.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("rseed", pbjson::private::base64::encode(&self.rseed).as_str())?;
         }
         if !self.value_blinding.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("valueBlinding", pbjson::private::base64::encode(&self.value_blinding).as_str())?;
         }
         if !self.proof_blinding_r.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proofBlindingR", pbjson::private::base64::encode(&self.proof_blinding_r).as_str())?;
         }
         if !self.proof_blinding_s.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proofBlindingS", pbjson::private::base64::encode(&self.proof_blinding_s).as_str())?;
         }
         struct_ser.end()
@@ -3804,6 +3817,7 @@ impl serde::Serialize for SpendBody {
         }
         if !self.encrypted_backref.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("encryptedBackref", pbjson::private::base64::encode(&self.encrypted_backref).as_str())?;
         }
         struct_ser.end()
@@ -3955,22 +3969,27 @@ impl serde::Serialize for SpendPlan {
         }
         if self.position != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("position", ToString::to_string(&self.position).as_str())?;
         }
         if !self.randomizer.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("randomizer", pbjson::private::base64::encode(&self.randomizer).as_str())?;
         }
         if !self.value_blinding.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("valueBlinding", pbjson::private::base64::encode(&self.value_blinding).as_str())?;
         }
         if !self.proof_blinding_r.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proofBlindingR", pbjson::private::base64::encode(&self.proof_blinding_r).as_str())?;
         }
         if !self.proof_blinding_s.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proofBlindingS", pbjson::private::base64::encode(&self.proof_blinding_s).as_str())?;
         }
         struct_ser.end()
@@ -4455,6 +4474,7 @@ impl serde::Serialize for ZkNullifierDerivationProof {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.shielded_pool.v1.ZKNullifierDerivationProof", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -4553,6 +4573,7 @@ impl serde::Serialize for ZkOutputProof {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.shielded_pool.v1.ZKOutputProof", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -4651,6 +4672,7 @@ impl serde::Serialize for ZkSpendProof {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.shielded_pool.v1.ZKSpendProof", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.core.component.stake.v1.rs b/crates/proto/src/gen/penumbra.core.component.stake.v1.rs
index 27b7ffe457..46531b65a3 100644
--- a/crates/proto/src/gen/penumbra.core.component.stake.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.component.stake.v1.rs
@@ -1,5 +1,5 @@
+// This file is @generated by prost-build.
 /// A Penumbra ZK undelegate claim proof.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ZkUndelegateClaimProof {
     #[prost(bytes = "vec", tag = "1")]
@@ -9,11 +9,13 @@ impl ::prost::Name for ZkUndelegateClaimProof {
     const NAME: &'static str = "ZKUndelegateClaimProof";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ZKUndelegateClaimProof".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ZKUndelegateClaimProof".into()
     }
 }
 /// Describes a validator's configuration data.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Validator {
     /// The validator's identity verification key.
@@ -54,11 +56,13 @@ impl ::prost::Name for Validator {
     const NAME: &'static str = "Validator";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.Validator".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.Validator".into()
     }
 }
 /// For storing the list of keys of known validators.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorList {
     #[prost(message, repeated, tag = "1")]
@@ -70,11 +74,13 @@ impl ::prost::Name for ValidatorList {
     const NAME: &'static str = "ValidatorList";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ValidatorList".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ValidatorList".into()
     }
 }
 /// A portion of a validator's commission.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct FundingStream {
     /// The recipient of the funding stream.
@@ -83,7 +89,6 @@ pub struct FundingStream {
 }
 /// Nested message and enum types in `FundingStream`.
 pub mod funding_stream {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct ToAddress {
         /// The destination address for the funding stream.
@@ -98,13 +103,13 @@ pub mod funding_stream {
         const NAME: &'static str = "ToAddress";
         const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.stake.v1.FundingStream.{}", Self::NAME
-            )
+            "penumbra.core.component.stake.v1.FundingStream.ToAddress".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.stake.v1.FundingStream.ToAddress".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct ToCommunityPool {
         /// The portion of the staking reward for the entire delegation pool
         /// allocated to this funding stream, specified in basis points.
@@ -115,13 +120,13 @@ pub mod funding_stream {
         const NAME: &'static str = "ToCommunityPool";
         const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.component.stake.v1.FundingStream.{}", Self::NAME
-            )
+            "penumbra.core.component.stake.v1.FundingStream.ToCommunityPool".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.component.stake.v1.FundingStream.ToCommunityPool".into()
         }
     }
     /// The recipient of the funding stream.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Recipient {
         #[prost(message, tag = "1")]
@@ -134,11 +139,13 @@ impl ::prost::Name for FundingStream {
     const NAME: &'static str = "FundingStream";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.FundingStream".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.FundingStream".into()
     }
 }
 /// Describes the reward and exchange rates and voting power for a validator in some epoch.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RateData {
     #[prost(message, optional, tag = "1")]
@@ -163,12 +170,14 @@ impl ::prost::Name for RateData {
     const NAME: &'static str = "RateData";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.RateData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.RateData".into()
     }
 }
 /// Describes the base reward and exchange rates in some epoch.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct BaseRateData {
     #[prost(uint64, tag = "1")]
     pub epoch_index: u64,
@@ -181,11 +190,13 @@ impl ::prost::Name for BaseRateData {
     const NAME: &'static str = "BaseRateData";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.BaseRateData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.BaseRateData".into()
     }
 }
 /// Describes the current state of a validator on-chain
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorStatus {
     #[prost(message, optional, tag = "1")]
@@ -201,12 +212,14 @@ impl ::prost::Name for ValidatorStatus {
     const NAME: &'static str = "ValidatorStatus";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ValidatorStatus".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ValidatorStatus".into()
     }
 }
 /// Describes the unbonding state of a validator's stake pool.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct BondingState {
     #[prost(enumeration = "bonding_state::BondingStateEnum", tag = "1")]
     pub state: i32,
@@ -243,10 +256,10 @@ pub mod bonding_state {
         /// (if the ProtoBuf definition does not change) and safe for programmatic use.
         pub fn as_str_name(&self) -> &'static str {
             match self {
-                BondingStateEnum::Unspecified => "BONDING_STATE_ENUM_UNSPECIFIED",
-                BondingStateEnum::Bonded => "BONDING_STATE_ENUM_BONDED",
-                BondingStateEnum::Unbonding => "BONDING_STATE_ENUM_UNBONDING",
-                BondingStateEnum::Unbonded => "BONDING_STATE_ENUM_UNBONDED",
+                Self::Unspecified => "BONDING_STATE_ENUM_UNSPECIFIED",
+                Self::Bonded => "BONDING_STATE_ENUM_BONDED",
+                Self::Unbonding => "BONDING_STATE_ENUM_UNBONDING",
+                Self::Unbonded => "BONDING_STATE_ENUM_UNBONDED",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.
@@ -265,12 +278,14 @@ impl ::prost::Name for BondingState {
     const NAME: &'static str = "BondingState";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.BondingState".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.BondingState".into()
     }
 }
 /// Describes the state of a validator
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ValidatorState {
     #[prost(enumeration = "validator_state::ValidatorStateEnum", tag = "1")]
     pub state: i32,
@@ -305,13 +320,13 @@ pub mod validator_state {
         /// (if the ProtoBuf definition does not change) and safe for programmatic use.
         pub fn as_str_name(&self) -> &'static str {
             match self {
-                ValidatorStateEnum::Unspecified => "VALIDATOR_STATE_ENUM_UNSPECIFIED",
-                ValidatorStateEnum::Defined => "VALIDATOR_STATE_ENUM_DEFINED",
-                ValidatorStateEnum::Inactive => "VALIDATOR_STATE_ENUM_INACTIVE",
-                ValidatorStateEnum::Active => "VALIDATOR_STATE_ENUM_ACTIVE",
-                ValidatorStateEnum::Jailed => "VALIDATOR_STATE_ENUM_JAILED",
-                ValidatorStateEnum::Tombstoned => "VALIDATOR_STATE_ENUM_TOMBSTONED",
-                ValidatorStateEnum::Disabled => "VALIDATOR_STATE_ENUM_DISABLED",
+                Self::Unspecified => "VALIDATOR_STATE_ENUM_UNSPECIFIED",
+                Self::Defined => "VALIDATOR_STATE_ENUM_DEFINED",
+                Self::Inactive => "VALIDATOR_STATE_ENUM_INACTIVE",
+                Self::Active => "VALIDATOR_STATE_ENUM_ACTIVE",
+                Self::Jailed => "VALIDATOR_STATE_ENUM_JAILED",
+                Self::Tombstoned => "VALIDATOR_STATE_ENUM_TOMBSTONED",
+                Self::Disabled => "VALIDATOR_STATE_ENUM_DISABLED",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.
@@ -333,11 +348,13 @@ impl ::prost::Name for ValidatorState {
     const NAME: &'static str = "ValidatorState";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ValidatorState".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ValidatorState".into()
     }
 }
 /// Combines all validator info into a single packet.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorInfo {
     #[prost(message, optional, tag = "1")]
@@ -351,11 +368,13 @@ impl ::prost::Name for ValidatorInfo {
     const NAME: &'static str = "ValidatorInfo";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ValidatorInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ValidatorInfo".into()
     }
 }
 /// A transaction action (re)defining a validator.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorDefinition {
     /// The configuration data for the validator.
@@ -369,11 +388,13 @@ impl ::prost::Name for ValidatorDefinition {
     const NAME: &'static str = "ValidatorDefinition";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ValidatorDefinition".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ValidatorDefinition".into()
     }
 }
 /// A transaction action adding stake to a validator's delegation pool.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Delegate {
     /// The identity key of the validator to delegate to.
@@ -401,11 +422,13 @@ impl ::prost::Name for Delegate {
     const NAME: &'static str = "Delegate";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.Delegate".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.Delegate".into()
     }
 }
 /// A transaction action withdrawing stake from a validator's delegation pool.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Undelegate {
     /// The identity key of the validator to undelegate from.
@@ -435,12 +458,14 @@ impl ::prost::Name for Undelegate {
     const NAME: &'static str = "Undelegate";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.Undelegate".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.Undelegate".into()
     }
 }
 /// A transaction action finishing an undelegation, converting (slashable)
 /// "unbonding tokens" to (unslashable) staking tokens.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UndelegateClaim {
     #[prost(message, optional, tag = "1")]
@@ -452,10 +477,12 @@ impl ::prost::Name for UndelegateClaim {
     const NAME: &'static str = "UndelegateClaim";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.UndelegateClaim".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.UndelegateClaim".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UndelegateClaimBody {
     /// The identity key of the validator to finish undelegating from.
@@ -484,10 +511,12 @@ impl ::prost::Name for UndelegateClaimBody {
     const NAME: &'static str = "UndelegateClaimBody";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.UndelegateClaimBody".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.UndelegateClaimBody".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UndelegateClaimPlan {
     /// The identity key of the validator to finish undelegating from.
@@ -524,11 +553,13 @@ impl ::prost::Name for UndelegateClaimPlan {
     const NAME: &'static str = "UndelegateClaimPlan";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.UndelegateClaimPlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.UndelegateClaimPlan".into()
     }
 }
 /// A list of pending delegations and undelegations.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DelegationChanges {
     #[prost(message, repeated, tag = "1")]
@@ -540,11 +571,13 @@ impl ::prost::Name for DelegationChanges {
     const NAME: &'static str = "DelegationChanges";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.DelegationChanges".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.DelegationChanges".into()
     }
 }
 /// Track's a validator's uptime.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Uptime {
     #[prost(uint64, tag = "1")]
@@ -558,12 +591,14 @@ impl ::prost::Name for Uptime {
     const NAME: &'static str = "Uptime";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.Uptime".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.Uptime".into()
     }
 }
 /// Tracks our view of Tendermint's view of the validator set, so we can keep it
 /// from getting confused.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CurrentConsensusKeys {
     #[prost(message, repeated, tag = "1")]
@@ -575,11 +610,13 @@ impl ::prost::Name for CurrentConsensusKeys {
     const NAME: &'static str = "CurrentConsensusKeys";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.CurrentConsensusKeys".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.CurrentConsensusKeys".into()
     }
 }
 /// Tracks slashing penalties applied to a validator in some epoch.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Penalty {
     #[prost(bytes = "vec", tag = "1")]
@@ -589,11 +626,13 @@ impl ::prost::Name for Penalty {
     const NAME: &'static str = "Penalty";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.Penalty".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.Penalty".into()
     }
 }
 /// Requests information about a specific validator.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetValidatorInfoRequest {
     /// The identity key of the validator.
@@ -604,10 +643,12 @@ impl ::prost::Name for GetValidatorInfoRequest {
     const NAME: &'static str = "GetValidatorInfoRequest";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.GetValidatorInfoRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.GetValidatorInfoRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetValidatorInfoResponse {
     #[prost(message, optional, tag = "1")]
@@ -617,12 +658,14 @@ impl ::prost::Name for GetValidatorInfoResponse {
     const NAME: &'static str = "GetValidatorInfoResponse";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.GetValidatorInfoResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.GetValidatorInfoResponse".into()
     }
 }
 /// Requests information on the chain's validators.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ValidatorInfoRequest {
     /// Whether or not to return inactive validators
     #[prost(bool, tag = "2")]
@@ -632,10 +675,12 @@ impl ::prost::Name for ValidatorInfoRequest {
     const NAME: &'static str = "ValidatorInfoRequest";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ValidatorInfoRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ValidatorInfoRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorInfoResponse {
     #[prost(message, optional, tag = "1")]
@@ -645,10 +690,12 @@ impl ::prost::Name for ValidatorInfoResponse {
     const NAME: &'static str = "ValidatorInfoResponse";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ValidatorInfoResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ValidatorInfoResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorStatusRequest {
     #[prost(message, optional, tag = "2")]
@@ -658,10 +705,12 @@ impl ::prost::Name for ValidatorStatusRequest {
     const NAME: &'static str = "ValidatorStatusRequest";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ValidatorStatusRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ValidatorStatusRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorStatusResponse {
     #[prost(message, optional, tag = "1")]
@@ -671,11 +720,13 @@ impl ::prost::Name for ValidatorStatusResponse {
     const NAME: &'static str = "ValidatorStatusResponse";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ValidatorStatusResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ValidatorStatusResponse".into()
     }
 }
 /// Requests the compounded penalty for a validator over a range of epochs.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorPenaltyRequest {
     #[prost(message, optional, tag = "2")]
@@ -689,10 +740,12 @@ impl ::prost::Name for ValidatorPenaltyRequest {
     const NAME: &'static str = "ValidatorPenaltyRequest";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ValidatorPenaltyRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ValidatorPenaltyRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorPenaltyResponse {
     #[prost(message, optional, tag = "1")]
@@ -702,10 +755,12 @@ impl ::prost::Name for ValidatorPenaltyResponse {
     const NAME: &'static str = "ValidatorPenaltyResponse";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ValidatorPenaltyResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ValidatorPenaltyResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CurrentValidatorRateRequest {
     #[prost(message, optional, tag = "2")]
@@ -715,10 +770,12 @@ impl ::prost::Name for CurrentValidatorRateRequest {
     const NAME: &'static str = "CurrentValidatorRateRequest";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.CurrentValidatorRateRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.CurrentValidatorRateRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CurrentValidatorRateResponse {
     #[prost(message, optional, tag = "1")]
@@ -728,10 +785,12 @@ impl ::prost::Name for CurrentValidatorRateResponse {
     const NAME: &'static str = "CurrentValidatorRateResponse";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.CurrentValidatorRateResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.CurrentValidatorRateResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorUptimeRequest {
     #[prost(message, optional, tag = "2")]
@@ -741,10 +800,12 @@ impl ::prost::Name for ValidatorUptimeRequest {
     const NAME: &'static str = "ValidatorUptimeRequest";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ValidatorUptimeRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ValidatorUptimeRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorUptimeResponse {
     #[prost(message, optional, tag = "1")]
@@ -754,12 +815,14 @@ impl ::prost::Name for ValidatorUptimeResponse {
     const NAME: &'static str = "ValidatorUptimeResponse";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.ValidatorUptimeResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.ValidatorUptimeResponse".into()
     }
 }
 /// Staking configuration data.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct StakeParameters {
     /// The number of epochs an unbonding note for before being released.
     #[deprecated]
@@ -797,11 +860,13 @@ impl ::prost::Name for StakeParameters {
     const NAME: &'static str = "StakeParameters";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.StakeParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.StakeParameters".into()
     }
 }
 /// Genesis data for the staking component.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GenesisContent {
     /// The configuration parameters for the staking component present at genesis
@@ -815,10 +880,12 @@ impl ::prost::Name for GenesisContent {
     const NAME: &'static str = "GenesisContent";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.GenesisContent".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.GenesisContent".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventTombstoneValidator {
     /// The height at which the offense occurred.
@@ -841,10 +908,12 @@ impl ::prost::Name for EventTombstoneValidator {
     const NAME: &'static str = "EventTombstoneValidator";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.EventTombstoneValidator".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.EventTombstoneValidator".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventValidatorStateChange {
     /// The validator's identity key.
@@ -858,10 +927,12 @@ impl ::prost::Name for EventValidatorStateChange {
     const NAME: &'static str = "EventValidatorStateChange";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.EventValidatorStateChange".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.EventValidatorStateChange".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventValidatorVotingPowerChange {
     /// The validator's identity key.
@@ -875,10 +946,12 @@ impl ::prost::Name for EventValidatorVotingPowerChange {
     const NAME: &'static str = "EventValidatorVotingPowerChange";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.EventValidatorVotingPowerChange".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.EventValidatorVotingPowerChange".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventValidatorBondingStateChange {
     /// The validator's identity key.
@@ -892,10 +965,12 @@ impl ::prost::Name for EventValidatorBondingStateChange {
     const NAME: &'static str = "EventValidatorBondingStateChange";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.EventValidatorBondingStateChange".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.EventValidatorBondingStateChange".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventRateDataChange {
     /// The validator's identity key.
@@ -909,10 +984,12 @@ impl ::prost::Name for EventRateDataChange {
     const NAME: &'static str = "EventRateDataChange";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.EventRateDataChange".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.EventRateDataChange".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventValidatorDefinitionUpload {
     /// The validator definition.
@@ -923,10 +1000,12 @@ impl ::prost::Name for EventValidatorDefinitionUpload {
     const NAME: &'static str = "EventValidatorDefinitionUpload";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.EventValidatorDefinitionUpload".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.EventValidatorDefinitionUpload".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventValidatorMissedBlock {
     /// The validator's identity key.
@@ -937,10 +1016,12 @@ impl ::prost::Name for EventValidatorMissedBlock {
     const NAME: &'static str = "EventValidatorMissedBlock";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.EventValidatorMissedBlock".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.EventValidatorMissedBlock".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventDelegate {
     /// The validator's identity key.
@@ -954,10 +1035,12 @@ impl ::prost::Name for EventDelegate {
     const NAME: &'static str = "EventDelegate";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.EventDelegate".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.EventDelegate".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventUndelegate {
     /// The validator's identity key.
@@ -971,11 +1054,13 @@ impl ::prost::Name for EventUndelegate {
     const NAME: &'static str = "EventUndelegate";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.EventUndelegate".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.EventUndelegate".into()
     }
 }
 /// Indicates a slashing penalty was applied to a validator's reward rates.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventSlashingPenaltyApplied {
     /// The validator's identity key.
@@ -992,13 +1077,22 @@ impl ::prost::Name for EventSlashingPenaltyApplied {
     const NAME: &'static str = "EventSlashingPenaltyApplied";
     const PACKAGE: &'static str = "penumbra.core.component.stake.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.component.stake.v1.{}", Self::NAME)
+        "penumbra.core.component.stake.v1.EventSlashingPenaltyApplied".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.component.stake.v1.EventSlashingPenaltyApplied".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Query operations for the staking component.
@@ -1021,8 +1115,8 @@ pub mod query_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -1047,7 +1141,7 @@ pub mod query_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             QueryServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -1094,8 +1188,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1125,8 +1218,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1155,8 +1247,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1185,8 +1276,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1215,8 +1305,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1245,8 +1334,7 @@ pub mod query_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1269,11 +1357,17 @@ pub mod query_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod query_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with QueryServiceServer.
     #[async_trait]
-    pub trait QueryService: Send + Sync + 'static {
+    pub trait QueryService: std::marker::Send + std::marker::Sync + 'static {
         /// Queries for information about a specific validator.
         async fn get_validator_info(
             &self,
@@ -1286,7 +1380,7 @@ pub mod query_service_server {
         type ValidatorInfoStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::ValidatorInfoResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Queries the current validator set, with filtering.
         async fn validator_info(
@@ -1327,20 +1421,18 @@ pub mod query_service_server {
     }
     /// Query operations for the staking component.
     #[derive(Debug)]
-    pub struct QueryServiceServer<T: QueryService> {
-        inner: _Inner<T>,
+    pub struct QueryServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: QueryService> QueryServiceServer<T> {
+    impl<T> QueryServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -1390,8 +1482,8 @@ pub mod query_service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for QueryServiceServer<T>
     where
         T: QueryService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -1403,7 +1495,6 @@ pub mod query_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.core.component.stake.v1.QueryService/GetValidatorInfo" => {
                     #[allow(non_camel_case_types)]
@@ -1435,7 +1526,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = GetValidatorInfoSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1482,7 +1572,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ValidatorInfoSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1528,7 +1617,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ValidatorStatusSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1575,7 +1663,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ValidatorPenaltySvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1622,7 +1709,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = CurrentValidatorRateSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1668,7 +1754,6 @@ pub mod query_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ValidatorUptimeSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1687,20 +1772,25 @@ pub mod query_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: QueryService> Clone for QueryServiceServer<T> {
+    impl<T> Clone for QueryServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -1712,17 +1802,9 @@ pub mod query_service_server {
             }
         }
     }
-    impl<T: QueryService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: QueryService> tonic::server::NamedService for QueryServiceServer<T> {
-        const NAME: &'static str = "penumbra.core.component.stake.v1.QueryService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.core.component.stake.v1.QueryService";
+    impl<T> tonic::server::NamedService for QueryServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.component.stake.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.stake.v1.serde.rs
index e3f0f42615..64e228715c 100644
--- a/crates/proto/src/gen/penumbra.core.component.stake.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.component.stake.v1.serde.rs
@@ -18,6 +18,7 @@ impl serde::Serialize for BaseRateData {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.stake.v1.BaseRateData", len)?;
         if self.epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("epochIndex", ToString::to_string(&self.epoch_index).as_str())?;
         }
         if let Some(v) = self.base_reward_rate.as_ref() {
@@ -158,10 +159,12 @@ impl serde::Serialize for BondingState {
         }
         if self.unbonds_at_epoch != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("unbondsAtEpoch", ToString::to_string(&self.unbonds_at_epoch).as_str())?;
         }
         if self.unbonds_at_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("unbondsAtHeight", ToString::to_string(&self.unbonds_at_height).as_str())?;
         }
         struct_ser.end()
@@ -662,6 +665,7 @@ impl serde::Serialize for Delegate {
         }
         if self.epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("epochIndex", ToString::to_string(&self.epoch_index).as_str())?;
         }
         if let Some(v) = self.unbonded_amount.as_ref() {
@@ -1151,6 +1155,7 @@ impl serde::Serialize for EventSlashingPenaltyApplied {
         }
         if self.epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("epochIndex", ToString::to_string(&self.epoch_index).as_str())?;
         }
         if let Some(v) = self.new_penalty.as_ref() {
@@ -1289,10 +1294,12 @@ impl serde::Serialize for EventTombstoneValidator {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.stake.v1.EventTombstoneValidator", len)?;
         if self.evidence_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("evidenceHeight", ToString::to_string(&self.evidence_height).as_str())?;
         }
         if self.current_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("currentHeight", ToString::to_string(&self.current_height).as_str())?;
         }
         if let Some(v) = self.identity_key.as_ref() {
@@ -1300,10 +1307,12 @@ impl serde::Serialize for EventTombstoneValidator {
         }
         if !self.address.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("address", pbjson::private::base64::encode(&self.address).as_str())?;
         }
         if self.voting_power != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("votingPower", ToString::to_string(&self.voting_power).as_str())?;
         }
         struct_ser.end()
@@ -2734,6 +2743,7 @@ impl serde::Serialize for Penalty {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.stake.v1.Penalty", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -2844,6 +2854,7 @@ impl serde::Serialize for RateData {
         }
         if self.epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("epochIndex", ToString::to_string(&self.epoch_index).as_str())?;
         }
         if let Some(v) = self.validator_reward_rate.as_ref() {
@@ -3009,30 +3020,37 @@ impl serde::Serialize for StakeParameters {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.stake.v1.StakeParameters", len)?;
         if self.unbonding_epochs != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("unbondingEpochs", ToString::to_string(&self.unbonding_epochs).as_str())?;
         }
         if self.active_validator_limit != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("activeValidatorLimit", ToString::to_string(&self.active_validator_limit).as_str())?;
         }
         if self.base_reward_rate != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("baseRewardRate", ToString::to_string(&self.base_reward_rate).as_str())?;
         }
         if self.slashing_penalty_misbehavior != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("slashingPenaltyMisbehavior", ToString::to_string(&self.slashing_penalty_misbehavior).as_str())?;
         }
         if self.slashing_penalty_downtime != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("slashingPenaltyDowntime", ToString::to_string(&self.slashing_penalty_downtime).as_str())?;
         }
         if self.signed_blocks_window_len != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("signedBlocksWindowLen", ToString::to_string(&self.signed_blocks_window_len).as_str())?;
         }
         if self.missed_blocks_maximum != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("missedBlocksMaximum", ToString::to_string(&self.missed_blocks_maximum).as_str())?;
         }
         if let Some(v) = self.min_validator_stake.as_ref() {
@@ -3040,6 +3058,7 @@ impl serde::Serialize for StakeParameters {
         }
         if self.unbonding_delay != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("unbondingDelay", ToString::to_string(&self.unbonding_delay).as_str())?;
         }
         struct_ser.end()
@@ -3264,6 +3283,7 @@ impl serde::Serialize for Undelegate {
         }
         if self.start_epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startEpochIndex", ToString::to_string(&self.start_epoch_index).as_str())?;
         }
         if let Some(v) = self.unbonded_amount.as_ref() {
@@ -3426,6 +3446,7 @@ impl serde::Serialize for UndelegateClaim {
         }
         if !self.proof.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proof", pbjson::private::base64::encode(&self.proof).as_str())?;
         }
         struct_ser.end()
@@ -3550,6 +3571,7 @@ impl serde::Serialize for UndelegateClaimBody {
         }
         if self.start_epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startEpochIndex", ToString::to_string(&self.start_epoch_index).as_str())?;
         }
         if let Some(v) = self.penalty.as_ref() {
@@ -3560,6 +3582,7 @@ impl serde::Serialize for UndelegateClaimBody {
         }
         if self.unbonding_start_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("unbondingStartHeight", ToString::to_string(&self.unbonding_start_height).as_str())?;
         }
         struct_ser.end()
@@ -3732,6 +3755,7 @@ impl serde::Serialize for UndelegateClaimPlan {
         }
         if self.start_epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startEpochIndex", ToString::to_string(&self.start_epoch_index).as_str())?;
         }
         if let Some(v) = self.penalty.as_ref() {
@@ -3742,18 +3766,22 @@ impl serde::Serialize for UndelegateClaimPlan {
         }
         if !self.balance_blinding.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("balanceBlinding", pbjson::private::base64::encode(&self.balance_blinding).as_str())?;
         }
         if !self.proof_blinding_r.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proofBlindingR", pbjson::private::base64::encode(&self.proof_blinding_r).as_str())?;
         }
         if !self.proof_blinding_s.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proofBlindingS", pbjson::private::base64::encode(&self.proof_blinding_s).as_str())?;
         }
         if self.unbonding_start_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("unbondingStartHeight", ToString::to_string(&self.unbonding_start_height).as_str())?;
         }
         struct_ser.end()
@@ -3950,6 +3978,7 @@ impl serde::Serialize for Uptime {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.stake.v1.Uptime", len)?;
         if self.as_of_block_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("asOfBlockHeight", ToString::to_string(&self.as_of_block_height).as_str())?;
         }
         if self.window_len != 0 {
@@ -3957,6 +3986,7 @@ impl serde::Serialize for Uptime {
         }
         if !self.bitvec.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("bitvec", pbjson::private::base64::encode(&self.bitvec).as_str())?;
         }
         struct_ser.end()
@@ -4110,6 +4140,7 @@ impl serde::Serialize for Validator {
         }
         if !self.consensus_key.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("consensusKey", pbjson::private::base64::encode(&self.consensus_key).as_str())?;
         }
         if !self.name.is_empty() {
@@ -4330,6 +4361,7 @@ impl serde::Serialize for ValidatorDefinition {
         }
         if !self.auth_sig.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("authSig", pbjson::private::base64::encode(&self.auth_sig).as_str())?;
         }
         struct_ser.end()
@@ -4867,10 +4899,12 @@ impl serde::Serialize for ValidatorPenaltyRequest {
         }
         if self.start_epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startEpochIndex", ToString::to_string(&self.start_epoch_index).as_str())?;
         }
         if self.end_epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("endEpochIndex", ToString::to_string(&self.end_epoch_index).as_str())?;
         }
         struct_ser.end()
@@ -5805,6 +5839,7 @@ impl serde::Serialize for ZkUndelegateClaimProof {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.stake.v1.ZKUndelegateClaimProof", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.core.keys.v1.rs b/crates/proto/src/gen/penumbra.core.keys.v1.rs
index 6ba8e5c292..c59d5084e7 100644
--- a/crates/proto/src/gen/penumbra.core.keys.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.keys.v1.rs
@@ -1,6 +1,6 @@
+// This file is @generated by prost-build.
 /// A Penumbra address. An address in Penumbra is a Bech32m-encoded
 /// string, with the human-readable prefix (HRP) `penumbrav2t`.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Address {
     /// The bytes of the address. Must be represented as a series of
@@ -21,10 +21,12 @@ impl ::prost::Name for Address {
     const NAME: &'static str = "Address";
     const PACKAGE: &'static str = "penumbra.core.keys.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.keys.v1.{}", Self::NAME)
+        "penumbra.core.keys.v1.Address".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.keys.v1.Address".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AddressView {
     #[prost(oneof = "address_view::AddressView", tags = "1, 2")]
@@ -33,7 +35,6 @@ pub struct AddressView {
 /// Nested message and enum types in `AddressView`.
 pub mod address_view {
     /// A decoded address, with information about the address index and wallet ID visible.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Decoded {
         #[prost(message, optional, tag = "1")]
@@ -47,11 +48,13 @@ pub mod address_view {
         const NAME: &'static str = "Decoded";
         const PACKAGE: &'static str = "penumbra.core.keys.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!("penumbra.core.keys.v1.AddressView.{}", Self::NAME)
+            "penumbra.core.keys.v1.AddressView.Decoded".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.keys.v1.AddressView.Decoded".into()
         }
     }
     /// An opaque address, with no information about the address index or wallet ID visible.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Opaque {
         #[prost(message, optional, tag = "1")]
@@ -61,10 +64,12 @@ pub mod address_view {
         const NAME: &'static str = "Opaque";
         const PACKAGE: &'static str = "penumbra.core.keys.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!("penumbra.core.keys.v1.AddressView.{}", Self::NAME)
+            "penumbra.core.keys.v1.AddressView.Opaque".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.keys.v1.AddressView.Opaque".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum AddressView {
         #[prost(message, tag = "1")]
@@ -77,10 +82,12 @@ impl ::prost::Name for AddressView {
     const NAME: &'static str = "AddressView";
     const PACKAGE: &'static str = "penumbra.core.keys.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.keys.v1.{}", Self::NAME)
+        "penumbra.core.keys.v1.AddressView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.keys.v1.AddressView".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PayloadKey {
     #[prost(bytes = "vec", tag = "1")]
@@ -90,10 +97,12 @@ impl ::prost::Name for PayloadKey {
     const NAME: &'static str = "PayloadKey";
     const PACKAGE: &'static str = "penumbra.core.keys.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.keys.v1.{}", Self::NAME)
+        "penumbra.core.keys.v1.PayloadKey".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.keys.v1.PayloadKey".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SpendKey {
     #[prost(bytes = "vec", tag = "1")]
@@ -103,10 +112,12 @@ impl ::prost::Name for SpendKey {
     const NAME: &'static str = "SpendKey";
     const PACKAGE: &'static str = "penumbra.core.keys.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.keys.v1.{}", Self::NAME)
+        "penumbra.core.keys.v1.SpendKey".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.keys.v1.SpendKey".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct FullViewingKey {
     #[prost(bytes = "vec", tag = "1")]
@@ -116,10 +127,12 @@ impl ::prost::Name for FullViewingKey {
     const NAME: &'static str = "FullViewingKey";
     const PACKAGE: &'static str = "penumbra.core.keys.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.keys.v1.{}", Self::NAME)
+        "penumbra.core.keys.v1.FullViewingKey".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.keys.v1.FullViewingKey".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WalletId {
     #[prost(bytes = "vec", tag = "1")]
@@ -129,10 +142,12 @@ impl ::prost::Name for WalletId {
     const NAME: &'static str = "WalletId";
     const PACKAGE: &'static str = "penumbra.core.keys.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.keys.v1.{}", Self::NAME)
+        "penumbra.core.keys.v1.WalletId".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.keys.v1.WalletId".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Diversifier {
     #[prost(bytes = "vec", tag = "1")]
@@ -142,10 +157,12 @@ impl ::prost::Name for Diversifier {
     const NAME: &'static str = "Diversifier";
     const PACKAGE: &'static str = "penumbra.core.keys.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.keys.v1.{}", Self::NAME)
+        "penumbra.core.keys.v1.Diversifier".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.keys.v1.Diversifier".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AddressIndex {
     #[prost(uint32, tag = "2")]
@@ -157,11 +174,13 @@ impl ::prost::Name for AddressIndex {
     const NAME: &'static str = "AddressIndex";
     const PACKAGE: &'static str = "penumbra.core.keys.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.keys.v1.{}", Self::NAME)
+        "penumbra.core.keys.v1.AddressIndex".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.keys.v1.AddressIndex".into()
     }
 }
 /// A validator's identity key (decaf377-rdsa spendauth verification key).
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct IdentityKey {
     #[prost(bytes = "vec", tag = "1")]
@@ -171,11 +190,13 @@ impl ::prost::Name for IdentityKey {
     const NAME: &'static str = "IdentityKey";
     const PACKAGE: &'static str = "penumbra.core.keys.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.keys.v1.{}", Self::NAME)
+        "penumbra.core.keys.v1.IdentityKey".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.keys.v1.IdentityKey".into()
     }
 }
 /// A validator's governance key (decaf377-rdsa spendauth verification key).
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GovernanceKey {
     #[prost(bytes = "vec", tag = "1")]
@@ -185,10 +206,12 @@ impl ::prost::Name for GovernanceKey {
     const NAME: &'static str = "GovernanceKey";
     const PACKAGE: &'static str = "penumbra.core.keys.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.keys.v1.{}", Self::NAME)
+        "penumbra.core.keys.v1.GovernanceKey".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.keys.v1.GovernanceKey".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ConsensusKey {
     #[prost(bytes = "vec", tag = "1")]
@@ -198,6 +221,9 @@ impl ::prost::Name for ConsensusKey {
     const NAME: &'static str = "ConsensusKey";
     const PACKAGE: &'static str = "penumbra.core.keys.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.keys.v1.{}", Self::NAME)
+        "penumbra.core.keys.v1.ConsensusKey".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.keys.v1.ConsensusKey".into()
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.keys.v1.serde.rs b/crates/proto/src/gen/penumbra.core.keys.v1.serde.rs
index 3413390f9f..273b9fa030 100644
--- a/crates/proto/src/gen/penumbra.core.keys.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.keys.v1.serde.rs
@@ -15,6 +15,7 @@ impl serde::Serialize for Address {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.keys.v1.Address", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         if !self.alt_bech32m.is_empty() {
@@ -134,6 +135,7 @@ impl serde::Serialize for AddressIndex {
         }
         if !self.randomizer.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("randomizer", pbjson::private::base64::encode(&self.randomizer).as_str())?;
         }
         struct_ser.end()
@@ -583,6 +585,7 @@ impl serde::Serialize for ConsensusKey {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.keys.v1.ConsensusKey", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -681,6 +684,7 @@ impl serde::Serialize for Diversifier {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.keys.v1.Diversifier", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -779,6 +783,7 @@ impl serde::Serialize for FullViewingKey {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.keys.v1.FullViewingKey", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -877,6 +882,7 @@ impl serde::Serialize for GovernanceKey {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.keys.v1.GovernanceKey", len)?;
         if !self.gk.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("gk", pbjson::private::base64::encode(&self.gk).as_str())?;
         }
         struct_ser.end()
@@ -975,6 +981,7 @@ impl serde::Serialize for IdentityKey {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.keys.v1.IdentityKey", len)?;
         if !self.ik.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("ik", pbjson::private::base64::encode(&self.ik).as_str())?;
         }
         struct_ser.end()
@@ -1073,6 +1080,7 @@ impl serde::Serialize for PayloadKey {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.keys.v1.PayloadKey", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -1171,6 +1179,7 @@ impl serde::Serialize for SpendKey {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.keys.v1.SpendKey", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -1269,6 +1278,7 @@ impl serde::Serialize for WalletId {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.keys.v1.WalletId", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.core.num.v1.rs b/crates/proto/src/gen/penumbra.core.num.v1.rs
index fa7b875da5..b984486038 100644
--- a/crates/proto/src/gen/penumbra.core.num.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.num.v1.rs
@@ -1,10 +1,10 @@
+// This file is @generated by prost-build.
 /// The quantity of a particular Asset. Represented as a 128-bit unsigned integer,
 /// split over two fields, `lo` and `hi`, representing the low- and high-order bytes
 /// of the 128-bit value, respectively. Clients must assemble these bits in their
 /// implementation into a `uint128` or comparable data structure, in order to model
 /// the Amount accurately.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct Amount {
     #[prost(uint64, tag = "1")]
     pub lo: u64,
@@ -15,6 +15,9 @@ impl ::prost::Name for Amount {
     const NAME: &'static str = "Amount";
     const PACKAGE: &'static str = "penumbra.core.num.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.num.v1.{}", Self::NAME)
+        "penumbra.core.num.v1.Amount".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.num.v1.Amount".into()
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.num.v1.serde.rs b/crates/proto/src/gen/penumbra.core.num.v1.serde.rs
index f87f4a5f9e..fa6c06fdb4 100644
--- a/crates/proto/src/gen/penumbra.core.num.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.num.v1.serde.rs
@@ -15,10 +15,12 @@ impl serde::Serialize for Amount {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.num.v1.Amount", len)?;
         if self.lo != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("lo", ToString::to_string(&self.lo).as_str())?;
         }
         if self.hi != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("hi", ToString::to_string(&self.hi).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.core.transaction.v1.rs b/crates/proto/src/gen/penumbra.core.transaction.v1.rs
index 0cf2173a8b..2295d26332 100644
--- a/crates/proto/src/gen/penumbra.core.transaction.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.transaction.v1.rs
@@ -1,5 +1,5 @@
+// This file is @generated by prost-build.
 /// A Penumbra transaction.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Transaction {
     #[prost(message, optional, tag = "1")]
@@ -18,11 +18,13 @@ impl ::prost::Name for Transaction {
     const NAME: &'static str = "Transaction";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.Transaction".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.Transaction".into()
     }
 }
 /// The body of a transaction.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionBody {
     /// A list of actions (state changes) performed by this transaction.
@@ -44,11 +46,13 @@ impl ::prost::Name for TransactionBody {
     const NAME: &'static str = "TransactionBody";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.TransactionBody".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.TransactionBody".into()
     }
 }
 /// The parameters determining if a transaction should be accepted by the chain.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionParameters {
     /// The maximum height that this transaction can be included in the chain.
@@ -68,11 +72,13 @@ impl ::prost::Name for TransactionParameters {
     const NAME: &'static str = "TransactionParameters";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.TransactionParameters".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.TransactionParameters".into()
     }
 }
 /// Represents a transaction summary containing multiple effects.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionSummary {
     #[prost(message, repeated, tag = "1")]
@@ -81,7 +87,6 @@ pub struct TransactionSummary {
 /// Nested message and enum types in `TransactionSummary`.
 pub mod transaction_summary {
     /// Represents an individual effect of a transaction.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Effects {
         #[prost(message, optional, tag = "1")]
@@ -93,9 +98,10 @@ pub mod transaction_summary {
         const NAME: &'static str = "Effects";
         const PACKAGE: &'static str = "penumbra.core.transaction.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.transaction.v1.TransactionSummary.{}", Self::NAME
-            )
+            "penumbra.core.transaction.v1.TransactionSummary.Effects".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.transaction.v1.TransactionSummary.Effects".into()
         }
     }
 }
@@ -103,11 +109,13 @@ impl ::prost::Name for TransactionSummary {
     const NAME: &'static str = "TransactionSummary";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.TransactionSummary".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.TransactionSummary".into()
     }
 }
 /// Detection data used by a detection server performing Fuzzy Message Detection.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DetectionData {
     /// A list of clues for use with Fuzzy Message Detection.
@@ -120,11 +128,13 @@ impl ::prost::Name for DetectionData {
     const NAME: &'static str = "DetectionData";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.DetectionData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.DetectionData".into()
     }
 }
 /// A state change performed by a transaction.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Action {
     #[prost(
@@ -135,7 +145,6 @@ pub struct Action {
 }
 /// Nested message and enum types in `Action`.
 pub mod action {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Action {
         /// Common actions have numbers \< 15, to save space.
@@ -220,12 +229,14 @@ impl ::prost::Name for Action {
     const NAME: &'static str = "Action";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.Action".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.Action".into()
     }
 }
 /// A transaction perspective is a bundle of key material and commitment openings
 /// that allow generating a view of a transaction from that perspective.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionPerspective {
     #[prost(message, repeated, tag = "1")]
@@ -273,7 +284,6 @@ pub struct TransactionPerspective {
 }
 /// Nested message and enum types in `TransactionPerspective`.
 pub mod transaction_perspective {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct ExtendedMetadataById {
         #[prost(message, optional, tag = "1")]
@@ -285,9 +295,12 @@ pub mod transaction_perspective {
         const NAME: &'static str = "ExtendedMetadataById";
         const PACKAGE: &'static str = "penumbra.core.transaction.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.transaction.v1.TransactionPerspective.{}", Self::NAME
-            )
+            "penumbra.core.transaction.v1.TransactionPerspective.ExtendedMetadataById"
+                .into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.transaction.v1.TransactionPerspective.ExtendedMetadataById"
+                .into()
         }
     }
     /// Associates a nullifier with the transaction ID that created the nullified state commitment.
@@ -295,7 +308,6 @@ pub mod transaction_perspective {
     /// Note: this is *not* the transaction ID that revealed the nullifier.
     ///
     /// Allows walking backwards from a spend to the transaction that created the note.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct CreationTransactionIdByNullifier {
         #[prost(message, optional, tag = "1")]
@@ -311,15 +323,17 @@ pub mod transaction_perspective {
         const NAME: &'static str = "CreationTransactionIdByNullifier";
         const PACKAGE: &'static str = "penumbra.core.transaction.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.transaction.v1.TransactionPerspective.{}", Self::NAME
-            )
+            "penumbra.core.transaction.v1.TransactionPerspective.CreationTransactionIdByNullifier"
+                .into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.transaction.v1.TransactionPerspective.CreationTransactionIdByNullifier"
+                .into()
         }
     }
     /// Associates a commitment with the transaction ID that eventually nullified it.
     ///
     /// Allows walking forwards from an output to the transaction that spent the note.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct NullificationTransactionIdByCommitment {
         #[prost(message, optional, tag = "1")]
@@ -335,9 +349,12 @@ pub mod transaction_perspective {
         const NAME: &'static str = "NullificationTransactionIdByCommitment";
         const PACKAGE: &'static str = "penumbra.core.transaction.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.transaction.v1.TransactionPerspective.{}", Self::NAME
-            )
+            "penumbra.core.transaction.v1.TransactionPerspective.NullificationTransactionIdByCommitment"
+                .into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.transaction.v1.TransactionPerspective.NullificationTransactionIdByCommitment"
+                .into()
         }
     }
 }
@@ -345,10 +362,12 @@ impl ::prost::Name for TransactionPerspective {
     const NAME: &'static str = "TransactionPerspective";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.TransactionPerspective".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.TransactionPerspective".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PayloadKeyWithCommitment {
     #[prost(message, optional, tag = "1")]
@@ -362,10 +381,12 @@ impl ::prost::Name for PayloadKeyWithCommitment {
     const NAME: &'static str = "PayloadKeyWithCommitment";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.PayloadKeyWithCommitment".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.PayloadKeyWithCommitment".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NullifierWithNote {
     #[prost(message, optional, tag = "1")]
@@ -377,11 +398,13 @@ impl ::prost::Name for NullifierWithNote {
     const NAME: &'static str = "NullifierWithNote";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.NullifierWithNote".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.NullifierWithNote".into()
     }
 }
 /// View of a Penumbra transaction.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionView {
     /// View of the transaction body
@@ -401,10 +424,12 @@ impl ::prost::Name for TransactionView {
     const NAME: &'static str = "TransactionView";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.TransactionView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.TransactionView".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionBodyView {
     /// A list views into of actions (state changes) performed by this transaction.
@@ -426,11 +451,13 @@ impl ::prost::Name for TransactionBodyView {
     const NAME: &'static str = "TransactionBodyView";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.TransactionBodyView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.TransactionBodyView".into()
     }
 }
 /// A view of a specific state change action performed by a transaction.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ActionView {
     #[prost(
@@ -441,7 +468,6 @@ pub struct ActionView {
 }
 /// Nested message and enum types in `ActionView`.
 pub mod action_view {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum ActionView {
         /// Action types with visible/opaque variants
@@ -528,11 +554,13 @@ impl ::prost::Name for ActionView {
     const NAME: &'static str = "ActionView";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.ActionView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.ActionView".into()
     }
 }
 /// The data required to authorize a transaction plan.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuthorizationData {
     /// The computed auth hash for the approved transaction plan.
@@ -555,11 +583,13 @@ impl ::prost::Name for AuthorizationData {
     const NAME: &'static str = "AuthorizationData";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.AuthorizationData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.AuthorizationData".into()
     }
 }
 /// The data required for proving when building a transaction from a plan.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WitnessData {
     /// The anchor for the state transition proofs.
@@ -576,7 +606,10 @@ impl ::prost::Name for WitnessData {
     const NAME: &'static str = "WitnessData";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.WitnessData".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.WitnessData".into()
     }
 }
 /// Describes a planned transaction. Permits clients to prepare a transaction
@@ -584,7 +617,6 @@ impl ::prost::Name for WitnessData {
 ///
 /// The `TransactionPlan` is a fully determined bundle binding all of a transaction's effects.
 /// The only thing it does not include is the witness data used for proving.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionPlan {
     /// The sequence of actions planned for this transaction.
@@ -604,10 +636,12 @@ impl ::prost::Name for TransactionPlan {
     const NAME: &'static str = "TransactionPlan";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.TransactionPlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.TransactionPlan".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DetectionDataPlan {
     #[prost(message, repeated, tag = "5")]
@@ -617,14 +651,16 @@ impl ::prost::Name for DetectionDataPlan {
     const NAME: &'static str = "DetectionDataPlan";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.DetectionDataPlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.DetectionDataPlan".into()
     }
 }
 /// Describes a planned transaction action.
 ///
 /// Some transaction Actions don't have any private data and are treated as being plans
 /// themselves.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ActionPlan {
     #[prost(
@@ -635,7 +671,6 @@ pub struct ActionPlan {
 }
 /// Nested message and enum types in `ActionPlan`.
 pub mod action_plan {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Action {
         #[prost(message, tag = "1")]
@@ -724,11 +759,13 @@ impl ::prost::Name for ActionPlan {
     const NAME: &'static str = "ActionPlan";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.ActionPlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.ActionPlan".into()
     }
 }
 /// Describes a plan for forming a `Clue`.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CluePlan {
     /// The address.
@@ -745,11 +782,13 @@ impl ::prost::Name for CluePlan {
     const NAME: &'static str = "CluePlan";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.CluePlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.CluePlan".into()
     }
 }
 /// Describes a plan for forming the transaction memo.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MemoPlan {
     /// The plaintext.
@@ -763,11 +802,13 @@ impl ::prost::Name for MemoPlan {
     const NAME: &'static str = "MemoPlan";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.MemoPlan".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.MemoPlan".into()
     }
 }
 /// The encrypted memo data describing information about the purpose of a transaction.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MemoCiphertext {
     /// The encrypted data. 528 bytes.
@@ -778,11 +819,13 @@ impl ::prost::Name for MemoCiphertext {
     const NAME: &'static str = "MemoCiphertext";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.MemoCiphertext".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.MemoCiphertext".into()
     }
 }
 /// The plaintext describing information about the purpose of a transaction.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MemoPlaintext {
     /// The sender's return address.
@@ -799,10 +842,12 @@ impl ::prost::Name for MemoPlaintext {
     const NAME: &'static str = "MemoPlaintext";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.MemoPlaintext".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.MemoPlaintext".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MemoPlaintextView {
     #[prost(message, optional, tag = "1")]
@@ -814,10 +859,12 @@ impl ::prost::Name for MemoPlaintextView {
     const NAME: &'static str = "MemoPlaintextView";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.MemoPlaintextView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.MemoPlaintextView".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MemoView {
     #[prost(oneof = "memo_view::MemoView", tags = "1, 2")]
@@ -825,7 +872,6 @@ pub struct MemoView {
 }
 /// Nested message and enum types in `MemoView`.
 pub mod memo_view {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Visible {
         #[prost(message, optional, tag = "1")]
@@ -837,12 +883,12 @@ pub mod memo_view {
         const NAME: &'static str = "Visible";
         const PACKAGE: &'static str = "penumbra.core.transaction.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.transaction.v1.MemoView.{}", Self::NAME
-            )
+            "penumbra.core.transaction.v1.MemoView.Visible".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.transaction.v1.MemoView.Visible".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Opaque {
         #[prost(message, optional, tag = "1")]
@@ -852,12 +898,12 @@ pub mod memo_view {
         const NAME: &'static str = "Opaque";
         const PACKAGE: &'static str = "penumbra.core.transaction.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.core.transaction.v1.MemoView.{}", Self::NAME
-            )
+            "penumbra.core.transaction.v1.MemoView.Opaque".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.core.transaction.v1.MemoView.Opaque".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum MemoView {
         #[prost(message, tag = "1")]
@@ -870,6 +916,9 @@ impl ::prost::Name for MemoView {
     const NAME: &'static str = "MemoView";
     const PACKAGE: &'static str = "penumbra.core.transaction.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.transaction.v1.{}", Self::NAME)
+        "penumbra.core.transaction.v1.MemoView".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.transaction.v1.MemoView".into()
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.transaction.v1.serde.rs b/crates/proto/src/gen/penumbra.core.transaction.v1.serde.rs
index bd6767749d..ba9d7347a8 100644
--- a/crates/proto/src/gen/penumbra.core.transaction.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.transaction.v1.serde.rs
@@ -1449,10 +1449,12 @@ impl serde::Serialize for CluePlan {
         }
         if !self.rseed.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("rseed", pbjson::private::base64::encode(&self.rseed).as_str())?;
         }
         if self.precision_bits != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("precisionBits", ToString::to_string(&self.precision_bits).as_str())?;
         }
         struct_ser.end()
@@ -1768,6 +1770,7 @@ impl serde::Serialize for MemoCiphertext {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.transaction.v1.MemoCiphertext", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -2098,6 +2101,7 @@ impl serde::Serialize for MemoPlan {
         }
         if !self.key.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("key", pbjson::private::base64::encode(&self.key).as_str())?;
         }
         struct_ser.end()
@@ -3186,6 +3190,7 @@ impl serde::Serialize for TransactionParameters {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.transaction.v1.TransactionParameters", len)?;
         if self.expiry_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("expiryHeight", ToString::to_string(&self.expiry_height).as_str())?;
         }
         if !self.chain_id.is_empty() {
diff --git a/crates/proto/src/gen/penumbra.core.txhash.v1.rs b/crates/proto/src/gen/penumbra.core.txhash.v1.rs
index 35d8ae86e0..f595a962b5 100644
--- a/crates/proto/src/gen/penumbra.core.txhash.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.txhash.v1.rs
@@ -1,6 +1,6 @@
+// This file is @generated by prost-build.
 /// The hash of a Penumbra transaction's *effecting data*, describing the effects
 /// of the transaction on the chain state.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EffectHash {
     #[prost(bytes = "vec", tag = "1")]
@@ -10,13 +10,15 @@ impl ::prost::Name for EffectHash {
     const NAME: &'static str = "EffectHash";
     const PACKAGE: &'static str = "penumbra.core.txhash.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.txhash.v1.{}", Self::NAME)
+        "penumbra.core.txhash.v1.EffectHash".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.txhash.v1.EffectHash".into()
     }
 }
 /// A transaction ID, the Sha256 hash of a transaction.
 ///
 /// This is the hash of the plain byte encoding, used by Tendermint.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionId {
     #[prost(bytes = "vec", tag = "1")]
@@ -26,6 +28,9 @@ impl ::prost::Name for TransactionId {
     const NAME: &'static str = "TransactionId";
     const PACKAGE: &'static str = "penumbra.core.txhash.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.core.txhash.v1.{}", Self::NAME)
+        "penumbra.core.txhash.v1.TransactionId".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.core.txhash.v1.TransactionId".into()
     }
 }
diff --git a/crates/proto/src/gen/penumbra.core.txhash.v1.serde.rs b/crates/proto/src/gen/penumbra.core.txhash.v1.serde.rs
index afd53bee03..d2a884b62c 100644
--- a/crates/proto/src/gen/penumbra.core.txhash.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.txhash.v1.serde.rs
@@ -12,6 +12,7 @@ impl serde::Serialize for EffectHash {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.txhash.v1.EffectHash", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -110,6 +111,7 @@ impl serde::Serialize for TransactionId {
         let mut struct_ser = serializer.serialize_struct("penumbra.core.txhash.v1.TransactionId", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.crypto.decaf377_fmd.v1.rs b/crates/proto/src/gen/penumbra.crypto.decaf377_fmd.v1.rs
index 129a5e4b65..ba9d3eb3ed 100644
--- a/crates/proto/src/gen/penumbra.crypto.decaf377_fmd.v1.rs
+++ b/crates/proto/src/gen/penumbra.crypto.decaf377_fmd.v1.rs
@@ -1,5 +1,5 @@
+// This file is @generated by prost-build.
 /// A clue for use with Fuzzy Message Detection.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Clue {
     #[prost(bytes = "vec", tag = "1")]
@@ -9,6 +9,9 @@ impl ::prost::Name for Clue {
     const NAME: &'static str = "Clue";
     const PACKAGE: &'static str = "penumbra.crypto.decaf377_fmd.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.decaf377_fmd.v1.{}", Self::NAME)
+        "penumbra.crypto.decaf377_fmd.v1.Clue".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.decaf377_fmd.v1.Clue".into()
     }
 }
diff --git a/crates/proto/src/gen/penumbra.crypto.decaf377_fmd.v1.serde.rs b/crates/proto/src/gen/penumbra.crypto.decaf377_fmd.v1.serde.rs
index bbd9bf91bb..15c6d1fdfb 100644
--- a/crates/proto/src/gen/penumbra.crypto.decaf377_fmd.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.crypto.decaf377_fmd.v1.serde.rs
@@ -12,6 +12,7 @@ impl serde::Serialize for Clue {
         let mut struct_ser = serializer.serialize_struct("penumbra.crypto.decaf377_fmd.v1.Clue", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.crypto.decaf377_frost.v1.rs b/crates/proto/src/gen/penumbra.crypto.decaf377_frost.v1.rs
index 6c87752e14..e544c354ea 100644
--- a/crates/proto/src/gen/penumbra.crypto.decaf377_frost.v1.rs
+++ b/crates/proto/src/gen/penumbra.crypto.decaf377_frost.v1.rs
@@ -1,5 +1,5 @@
+// This file is @generated by prost-build.
 /// A commitment to a polynomial, as a list of group elements.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct VerifiableSecretSharingCommitment {
     /// Each of these bytes should be the serialization of a group element.
@@ -10,11 +10,13 @@ impl ::prost::Name for VerifiableSecretSharingCommitment {
     const NAME: &'static str = "VerifiableSecretSharingCommitment";
     const PACKAGE: &'static str = "penumbra.crypto.decaf377_frost.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.decaf377_frost.v1.{}", Self::NAME)
+        "penumbra.crypto.decaf377_frost.v1.VerifiableSecretSharingCommitment".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.decaf377_frost.v1.VerifiableSecretSharingCommitment".into()
     }
 }
 /// The public package sent in round 1 of the DKG protocol.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DkgRound1Package {
     /// A commitment to the polynomial for secret sharing.
@@ -28,11 +30,13 @@ impl ::prost::Name for DkgRound1Package {
     const NAME: &'static str = "DKGRound1Package";
     const PACKAGE: &'static str = "penumbra.crypto.decaf377_frost.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.decaf377_frost.v1.{}", Self::NAME)
+        "penumbra.crypto.decaf377_frost.v1.DKGRound1Package".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.decaf377_frost.v1.DKGRound1Package".into()
     }
 }
 /// A share of the final signing key.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SigningShare {
     /// These bytes should be a valid scalar.
@@ -43,11 +47,13 @@ impl ::prost::Name for SigningShare {
     const NAME: &'static str = "SigningShare";
     const PACKAGE: &'static str = "penumbra.crypto.decaf377_frost.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.decaf377_frost.v1.{}", Self::NAME)
+        "penumbra.crypto.decaf377_frost.v1.SigningShare".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.decaf377_frost.v1.SigningShare".into()
     }
 }
 /// The per-participant package sent in round 2 of the DKG protocol.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DkgRound2Package {
     /// This is the share we're sending to that participant.
@@ -58,11 +64,13 @@ impl ::prost::Name for DkgRound2Package {
     const NAME: &'static str = "DKGRound2Package";
     const PACKAGE: &'static str = "penumbra.crypto.decaf377_frost.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.decaf377_frost.v1.{}", Self::NAME)
+        "penumbra.crypto.decaf377_frost.v1.DKGRound2Package".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.decaf377_frost.v1.DKGRound2Package".into()
     }
 }
 /// Represents a commitment to a nonce value.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NonceCommitment {
     /// These bytes should be a valid group element.
@@ -73,11 +81,13 @@ impl ::prost::Name for NonceCommitment {
     const NAME: &'static str = "NonceCommitment";
     const PACKAGE: &'static str = "penumbra.crypto.decaf377_frost.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.decaf377_frost.v1.{}", Self::NAME)
+        "penumbra.crypto.decaf377_frost.v1.NonceCommitment".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.decaf377_frost.v1.NonceCommitment".into()
     }
 }
 /// Represents the commitments to nonces needed for signing.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SigningCommitments {
     /// One nonce to hide them.
@@ -91,11 +101,13 @@ impl ::prost::Name for SigningCommitments {
     const NAME: &'static str = "SigningCommitments";
     const PACKAGE: &'static str = "penumbra.crypto.decaf377_frost.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.decaf377_frost.v1.{}", Self::NAME)
+        "penumbra.crypto.decaf377_frost.v1.SigningCommitments".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.decaf377_frost.v1.SigningCommitments".into()
     }
 }
 /// A share of the final signature. These get aggregated to make the actual thing.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SignatureShare {
     /// These bytes should be a valid scalar.
@@ -106,6 +118,9 @@ impl ::prost::Name for SignatureShare {
     const NAME: &'static str = "SignatureShare";
     const PACKAGE: &'static str = "penumbra.crypto.decaf377_frost.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.decaf377_frost.v1.{}", Self::NAME)
+        "penumbra.crypto.decaf377_frost.v1.SignatureShare".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.decaf377_frost.v1.SignatureShare".into()
     }
 }
diff --git a/crates/proto/src/gen/penumbra.crypto.decaf377_frost.v1.serde.rs b/crates/proto/src/gen/penumbra.crypto.decaf377_frost.v1.serde.rs
index b84daf70b8..4e98b9248e 100644
--- a/crates/proto/src/gen/penumbra.crypto.decaf377_frost.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.crypto.decaf377_frost.v1.serde.rs
@@ -18,6 +18,7 @@ impl serde::Serialize for DkgRound1Package {
         }
         if !self.proof_of_knowledge.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proofOfKnowledge", pbjson::private::base64::encode(&self.proof_of_knowledge).as_str())?;
         }
         struct_ser.end()
@@ -224,6 +225,7 @@ impl serde::Serialize for NonceCommitment {
         let mut struct_ser = serializer.serialize_struct("penumbra.crypto.decaf377_frost.v1.NonceCommitment", len)?;
         if !self.element.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("element", pbjson::private::base64::encode(&self.element).as_str())?;
         }
         struct_ser.end()
@@ -322,6 +324,7 @@ impl serde::Serialize for SignatureShare {
         let mut struct_ser = serializer.serialize_struct("penumbra.crypto.decaf377_frost.v1.SignatureShare", len)?;
         if !self.scalar.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("scalar", pbjson::private::base64::encode(&self.scalar).as_str())?;
         }
         struct_ser.end()
@@ -532,6 +535,7 @@ impl serde::Serialize for SigningShare {
         let mut struct_ser = serializer.serialize_struct("penumbra.crypto.decaf377_frost.v1.SigningShare", len)?;
         if !self.scalar.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("scalar", pbjson::private::base64::encode(&self.scalar).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.crypto.decaf377_rdsa.v1.rs b/crates/proto/src/gen/penumbra.crypto.decaf377_rdsa.v1.rs
index b2686fa74f..5402c059a0 100644
--- a/crates/proto/src/gen/penumbra.crypto.decaf377_rdsa.v1.rs
+++ b/crates/proto/src/gen/penumbra.crypto.decaf377_rdsa.v1.rs
@@ -1,4 +1,4 @@
-#[allow(clippy::derive_partial_eq_without_eq)]
+// This file is @generated by prost-build.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SpendAuthSignature {
     #[prost(bytes = "vec", tag = "1")]
@@ -8,10 +8,12 @@ impl ::prost::Name for SpendAuthSignature {
     const NAME: &'static str = "SpendAuthSignature";
     const PACKAGE: &'static str = "penumbra.crypto.decaf377_rdsa.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.decaf377_rdsa.v1.{}", Self::NAME)
+        "penumbra.crypto.decaf377_rdsa.v1.SpendAuthSignature".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.decaf377_rdsa.v1.SpendAuthSignature".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BindingSignature {
     #[prost(bytes = "vec", tag = "1")]
@@ -21,10 +23,12 @@ impl ::prost::Name for BindingSignature {
     const NAME: &'static str = "BindingSignature";
     const PACKAGE: &'static str = "penumbra.crypto.decaf377_rdsa.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.decaf377_rdsa.v1.{}", Self::NAME)
+        "penumbra.crypto.decaf377_rdsa.v1.BindingSignature".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.decaf377_rdsa.v1.BindingSignature".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SpendVerificationKey {
     #[prost(bytes = "vec", tag = "1")]
@@ -34,6 +38,9 @@ impl ::prost::Name for SpendVerificationKey {
     const NAME: &'static str = "SpendVerificationKey";
     const PACKAGE: &'static str = "penumbra.crypto.decaf377_rdsa.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.decaf377_rdsa.v1.{}", Self::NAME)
+        "penumbra.crypto.decaf377_rdsa.v1.SpendVerificationKey".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.decaf377_rdsa.v1.SpendVerificationKey".into()
     }
 }
diff --git a/crates/proto/src/gen/penumbra.crypto.decaf377_rdsa.v1.serde.rs b/crates/proto/src/gen/penumbra.crypto.decaf377_rdsa.v1.serde.rs
index 5ffa592a93..1f976b4ded 100644
--- a/crates/proto/src/gen/penumbra.crypto.decaf377_rdsa.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.crypto.decaf377_rdsa.v1.serde.rs
@@ -12,6 +12,7 @@ impl serde::Serialize for BindingSignature {
         let mut struct_ser = serializer.serialize_struct("penumbra.crypto.decaf377_rdsa.v1.BindingSignature", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -110,6 +111,7 @@ impl serde::Serialize for SpendAuthSignature {
         let mut struct_ser = serializer.serialize_struct("penumbra.crypto.decaf377_rdsa.v1.SpendAuthSignature", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -208,6 +210,7 @@ impl serde::Serialize for SpendVerificationKey {
         let mut struct_ser = serializer.serialize_struct("penumbra.crypto.decaf377_rdsa.v1.SpendVerificationKey", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.crypto.tct.v1.rs b/crates/proto/src/gen/penumbra.crypto.tct.v1.rs
index b3979ce556..9f7d8bf365 100644
--- a/crates/proto/src/gen/penumbra.crypto.tct.v1.rs
+++ b/crates/proto/src/gen/penumbra.crypto.tct.v1.rs
@@ -1,4 +1,4 @@
-#[allow(clippy::derive_partial_eq_without_eq)]
+// This file is @generated by prost-build.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct StateCommitment {
     #[prost(bytes = "vec", tag = "1")]
@@ -8,10 +8,12 @@ impl ::prost::Name for StateCommitment {
     const NAME: &'static str = "StateCommitment";
     const PACKAGE: &'static str = "penumbra.crypto.tct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.tct.v1.{}", Self::NAME)
+        "penumbra.crypto.tct.v1.StateCommitment".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.tct.v1.StateCommitment".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MerkleRoot {
     #[prost(bytes = "vec", tag = "1")]
@@ -21,11 +23,13 @@ impl ::prost::Name for MerkleRoot {
     const NAME: &'static str = "MerkleRoot";
     const PACKAGE: &'static str = "penumbra.crypto.tct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.tct.v1.{}", Self::NAME)
+        "penumbra.crypto.tct.v1.MerkleRoot".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.tct.v1.MerkleRoot".into()
     }
 }
 /// An authentication path from a state commitment to the root of the state commitment tree.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct StateCommitmentProof {
     #[prost(message, optional, tag = "1")]
@@ -40,11 +44,13 @@ impl ::prost::Name for StateCommitmentProof {
     const NAME: &'static str = "StateCommitmentProof";
     const PACKAGE: &'static str = "penumbra.crypto.tct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.tct.v1.{}", Self::NAME)
+        "penumbra.crypto.tct.v1.StateCommitmentProof".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.tct.v1.StateCommitmentProof".into()
     }
 }
 /// A set of 3 sibling hashes in the auth path for some note commitment.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MerklePathChunk {
     #[prost(bytes = "vec", tag = "1")]
@@ -58,6 +64,9 @@ impl ::prost::Name for MerklePathChunk {
     const NAME: &'static str = "MerklePathChunk";
     const PACKAGE: &'static str = "penumbra.crypto.tct.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.crypto.tct.v1.{}", Self::NAME)
+        "penumbra.crypto.tct.v1.MerklePathChunk".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.crypto.tct.v1.MerklePathChunk".into()
     }
 }
diff --git a/crates/proto/src/gen/penumbra.crypto.tct.v1.serde.rs b/crates/proto/src/gen/penumbra.crypto.tct.v1.serde.rs
index e55d9ef249..6a55bc4ec7 100644
--- a/crates/proto/src/gen/penumbra.crypto.tct.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.crypto.tct.v1.serde.rs
@@ -18,14 +18,17 @@ impl serde::Serialize for MerklePathChunk {
         let mut struct_ser = serializer.serialize_struct("penumbra.crypto.tct.v1.MerklePathChunk", len)?;
         if !self.sibling_1.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("sibling1", pbjson::private::base64::encode(&self.sibling_1).as_str())?;
         }
         if !self.sibling_2.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("sibling2", pbjson::private::base64::encode(&self.sibling_2).as_str())?;
         }
         if !self.sibling_3.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("sibling3", pbjson::private::base64::encode(&self.sibling_3).as_str())?;
         }
         struct_ser.end()
@@ -153,6 +156,7 @@ impl serde::Serialize for MerkleRoot {
         let mut struct_ser = serializer.serialize_struct("penumbra.crypto.tct.v1.MerkleRoot", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -251,6 +255,7 @@ impl serde::Serialize for StateCommitment {
         let mut struct_ser = serializer.serialize_struct("penumbra.crypto.tct.v1.StateCommitment", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -358,6 +363,7 @@ impl serde::Serialize for StateCommitmentProof {
         }
         if self.position != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("position", ToString::to_string(&self.position).as_str())?;
         }
         if !self.auth_path.is_empty() {
diff --git a/crates/proto/src/gen/penumbra.custody.threshold.v1.rs b/crates/proto/src/gen/penumbra.custody.threshold.v1.rs
index 2bf788a6b6..9aa9410cb6 100644
--- a/crates/proto/src/gen/penumbra.custody.threshold.v1.rs
+++ b/crates/proto/src/gen/penumbra.custody.threshold.v1.rs
@@ -1,7 +1,7 @@
+// This file is @generated by prost-build.
 /// A key one can use to verify signatures.
 ///
 /// This key can also serve as a unique identifier for users.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct VerificationKey {
     #[prost(bytes = "vec", tag = "1")]
@@ -11,11 +11,13 @@ impl ::prost::Name for VerificationKey {
     const NAME: &'static str = "VerificationKey";
     const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.threshold.v1.{}", Self::NAME)
+        "penumbra.custody.threshold.v1.VerificationKey".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.threshold.v1.VerificationKey".into()
     }
 }
 /// A signature proving that a message was created by the owner of a verification key.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Signature {
     #[prost(bytes = "vec", tag = "1")]
@@ -25,11 +27,13 @@ impl ::prost::Name for Signature {
     const NAME: &'static str = "Signature";
     const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.threshold.v1.{}", Self::NAME)
+        "penumbra.custody.threshold.v1.Signature".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.threshold.v1.Signature".into()
     }
 }
 /// The message the coordinator sends in round 1 of the signing protocol.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CoordinatorRound1 {
     #[prost(oneof = "coordinator_round1::Request", tags = "1, 2, 3")]
@@ -37,7 +41,6 @@ pub struct CoordinatorRound1 {
 }
 /// Nested message and enum types in `CoordinatorRound1`.
 pub mod coordinator_round1 {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Request {
         /// The plan that the coordinator would like the followers to sign.
@@ -59,11 +62,13 @@ impl ::prost::Name for CoordinatorRound1 {
     const NAME: &'static str = "CoordinatorRound1";
     const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.threshold.v1.{}", Self::NAME)
+        "penumbra.custody.threshold.v1.CoordinatorRound1".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.threshold.v1.CoordinatorRound1".into()
     }
 }
 /// The message the coordinator sends in round 2 of the signing protocol.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CoordinatorRound2 {
     /// The underlying signing packages being sent to the followers, for each signature.
@@ -75,7 +80,6 @@ pub struct CoordinatorRound2 {
 /// Nested message and enum types in `CoordinatorRound2`.
 pub mod coordinator_round2 {
     /// A commitment along with a FROST identifier.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct IdentifiedCommitments {
         /// The serialization of a FROST identifier.
@@ -91,9 +95,12 @@ pub mod coordinator_round2 {
         const NAME: &'static str = "IdentifiedCommitments";
         const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.custody.threshold.v1.CoordinatorRound2.{}", Self::NAME
-            )
+            "penumbra.custody.threshold.v1.CoordinatorRound2.IdentifiedCommitments"
+                .into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.custody.threshold.v1.CoordinatorRound2.IdentifiedCommitments"
+                .into()
         }
     }
     /// A FROST signing package without a message.
@@ -101,7 +108,6 @@ pub mod coordinator_round2 {
     /// We structure things this way because the message is derived from the transaction plan.
     /// FROST expects the signing package to include the identified commitments *and*
     /// the message, but we have no need to include the message.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct PartialSigningPackage {
         #[prost(message, repeated, tag = "1")]
@@ -111,9 +117,12 @@ pub mod coordinator_round2 {
         const NAME: &'static str = "PartialSigningPackage";
         const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.custody.threshold.v1.CoordinatorRound2.{}", Self::NAME
-            )
+            "penumbra.custody.threshold.v1.CoordinatorRound2.PartialSigningPackage"
+                .into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.custody.threshold.v1.CoordinatorRound2.PartialSigningPackage"
+                .into()
         }
     }
 }
@@ -121,11 +130,13 @@ impl ::prost::Name for CoordinatorRound2 {
     const NAME: &'static str = "CoordinatorRound2";
     const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.threshold.v1.{}", Self::NAME)
+        "penumbra.custody.threshold.v1.CoordinatorRound2".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.threshold.v1.CoordinatorRound2".into()
     }
 }
 /// The first message the followers send back to the coordinator when signing.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct FollowerRound1 {
     #[prost(message, optional, tag = "1")]
@@ -140,7 +151,6 @@ pub struct FollowerRound1 {
 /// Nested message and enum types in `FollowerRound1`.
 pub mod follower_round1 {
     /// The inner message that will be signed by the follower.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Inner {
         /// One signing commitment pair for each signature requested by the plan, in order.
@@ -153,9 +163,10 @@ pub mod follower_round1 {
         const NAME: &'static str = "Inner";
         const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.custody.threshold.v1.FollowerRound1.{}", Self::NAME
-            )
+            "penumbra.custody.threshold.v1.FollowerRound1.Inner".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.custody.threshold.v1.FollowerRound1.Inner".into()
         }
     }
 }
@@ -163,11 +174,13 @@ impl ::prost::Name for FollowerRound1 {
     const NAME: &'static str = "FollowerRound1";
     const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.threshold.v1.{}", Self::NAME)
+        "penumbra.custody.threshold.v1.FollowerRound1".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.threshold.v1.FollowerRound1".into()
     }
 }
 /// The second message the followers send back to the coordinator when signing.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct FollowerRound2 {
     #[prost(message, optional, tag = "1")]
@@ -182,7 +195,6 @@ pub struct FollowerRound2 {
 /// Nested message and enum types in `FollowerRound2`.
 pub mod follower_round2 {
     /// The inner message that will be signed by the follower.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Inner {
         /// One share for each signature requested by the plan, in order.
@@ -195,9 +207,10 @@ pub mod follower_round2 {
         const NAME: &'static str = "Inner";
         const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.custody.threshold.v1.FollowerRound2.{}", Self::NAME
-            )
+            "penumbra.custody.threshold.v1.FollowerRound2.Inner".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.custody.threshold.v1.FollowerRound2.Inner".into()
         }
     }
 }
@@ -205,11 +218,13 @@ impl ::prost::Name for FollowerRound2 {
     const NAME: &'static str = "FollowerRound2";
     const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.threshold.v1.{}", Self::NAME)
+        "penumbra.custody.threshold.v1.FollowerRound2".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.threshold.v1.FollowerRound2".into()
     }
 }
 /// The first message we broadcast in the DKG protocol.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DkgRound1 {
     /// The package we're sending to other people
@@ -231,11 +246,13 @@ impl ::prost::Name for DkgRound1 {
     const NAME: &'static str = "DKGRound1";
     const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.threshold.v1.{}", Self::NAME)
+        "penumbra.custody.threshold.v1.DKGRound1".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.threshold.v1.DKGRound1".into()
     }
 }
 /// The second message we broadcast in the DKG protocol.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DkgRound2 {
     #[prost(message, optional, tag = "1")]
@@ -250,7 +267,6 @@ pub struct DkgRound2 {
 /// Nested message and enum types in `DKGRound2`.
 pub mod dkg_round2 {
     /// A round2 package, encrypted, along with an identifier for the recipient.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct TargetedPackage {
         /// A verification key identifying the recipient.
@@ -264,13 +280,13 @@ pub mod dkg_round2 {
         const NAME: &'static str = "TargetedPackage";
         const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.custody.threshold.v1.DKGRound2.{}", Self::NAME
-            )
+            "penumbra.custody.threshold.v1.DKGRound2.TargetedPackage".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.custody.threshold.v1.DKGRound2.TargetedPackage".into()
         }
     }
     /// An inner message that will be signed.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Inner {
         /// Encrypted packages for each recipient.
@@ -284,9 +300,10 @@ pub mod dkg_round2 {
         const NAME: &'static str = "Inner";
         const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.custody.threshold.v1.DKGRound2.{}", Self::NAME
-            )
+            "penumbra.custody.threshold.v1.DKGRound2.Inner".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.custody.threshold.v1.DKGRound2.Inner".into()
         }
     }
 }
@@ -294,6 +311,9 @@ impl ::prost::Name for DkgRound2 {
     const NAME: &'static str = "DKGRound2";
     const PACKAGE: &'static str = "penumbra.custody.threshold.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.threshold.v1.{}", Self::NAME)
+        "penumbra.custody.threshold.v1.DKGRound2".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.threshold.v1.DKGRound2".into()
     }
 }
diff --git a/crates/proto/src/gen/penumbra.custody.threshold.v1.serde.rs b/crates/proto/src/gen/penumbra.custody.threshold.v1.serde.rs
index 86ecbc1f91..224579889e 100644
--- a/crates/proto/src/gen/penumbra.custody.threshold.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.custody.threshold.v1.serde.rs
@@ -239,6 +239,7 @@ impl serde::Serialize for coordinator_round2::IdentifiedCommitments {
         let mut struct_ser = serializer.serialize_struct("penumbra.custody.threshold.v1.CoordinatorRound2.IdentifiedCommitments", len)?;
         if !self.identifier.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("identifier", pbjson::private::base64::encode(&self.identifier).as_str())?;
         }
         if let Some(v) = self.commitments.as_ref() {
@@ -459,14 +460,17 @@ impl serde::Serialize for DkgRound1 {
         }
         if !self.nullifier_commitment.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("nullifierCommitment", pbjson::private::base64::encode(&self.nullifier_commitment).as_str())?;
         }
         if !self.epk.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("epk", pbjson::private::base64::encode(&self.epk).as_str())?;
         }
         if !self.vk.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("vk", pbjson::private::base64::encode(&self.vk).as_str())?;
         }
         struct_ser.end()
@@ -612,10 +616,12 @@ impl serde::Serialize for DkgRound2 {
         }
         if !self.vk.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("vk", pbjson::private::base64::encode(&self.vk).as_str())?;
         }
         if !self.sig.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("sig", pbjson::private::base64::encode(&self.sig).as_str())?;
         }
         struct_ser.end()
@@ -744,6 +750,7 @@ impl serde::Serialize for dkg_round2::Inner {
         }
         if !self.nullifier.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("nullifier", pbjson::private::base64::encode(&self.nullifier).as_str())?;
         }
         struct_ser.end()
@@ -857,10 +864,12 @@ impl serde::Serialize for dkg_round2::TargetedPackage {
         let mut struct_ser = serializer.serialize_struct("penumbra.custody.threshold.v1.DKGRound2.TargetedPackage", len)?;
         if !self.vk.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("vk", pbjson::private::base64::encode(&self.vk).as_str())?;
         }
         if !self.encrypted_package.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("encryptedPackage", pbjson::private::base64::encode(&self.encrypted_package).as_str())?;
         }
         struct_ser.end()
@@ -1421,6 +1430,7 @@ impl serde::Serialize for Signature {
         let mut struct_ser = serializer.serialize_struct("penumbra.custody.threshold.v1.Signature", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
@@ -1519,6 +1529,7 @@ impl serde::Serialize for VerificationKey {
         let mut struct_ser = serializer.serialize_struct("penumbra.custody.threshold.v1.VerificationKey", len)?;
         if !self.inner.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.custody.v1.rs b/crates/proto/src/gen/penumbra.custody.v1.rs
index 82fe5c426b..0f4d04f470 100644
--- a/crates/proto/src/gen/penumbra.custody.v1.rs
+++ b/crates/proto/src/gen/penumbra.custody.v1.rs
@@ -1,4 +1,4 @@
-#[allow(clippy::derive_partial_eq_without_eq)]
+// This file is @generated by prost-build.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuthorizeRequest {
     /// The transaction plan to authorize.
@@ -19,10 +19,12 @@ impl ::prost::Name for AuthorizeRequest {
     const NAME: &'static str = "AuthorizeRequest";
     const PACKAGE: &'static str = "penumbra.custody.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.v1.{}", Self::NAME)
+        "penumbra.custody.v1.AuthorizeRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.v1.AuthorizeRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuthorizeResponse {
     #[prost(message, optional, tag = "1")]
@@ -34,10 +36,12 @@ impl ::prost::Name for AuthorizeResponse {
     const NAME: &'static str = "AuthorizeResponse";
     const PACKAGE: &'static str = "penumbra.custody.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.v1.{}", Self::NAME)
+        "penumbra.custody.v1.AuthorizeResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.v1.AuthorizeResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuthorizeValidatorDefinitionRequest {
     /// The validator definition to authorize.
@@ -58,10 +62,12 @@ impl ::prost::Name for AuthorizeValidatorDefinitionRequest {
     const NAME: &'static str = "AuthorizeValidatorDefinitionRequest";
     const PACKAGE: &'static str = "penumbra.custody.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.v1.{}", Self::NAME)
+        "penumbra.custody.v1.AuthorizeValidatorDefinitionRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.v1.AuthorizeValidatorDefinitionRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuthorizeValidatorDefinitionResponse {
     /// The authorization signature for the validator definition.
@@ -74,10 +80,12 @@ impl ::prost::Name for AuthorizeValidatorDefinitionResponse {
     const NAME: &'static str = "AuthorizeValidatorDefinitionResponse";
     const PACKAGE: &'static str = "penumbra.custody.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.v1.{}", Self::NAME)
+        "penumbra.custody.v1.AuthorizeValidatorDefinitionResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.v1.AuthorizeValidatorDefinitionResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuthorizeValidatorVoteRequest {
     /// The validator vote to authorize.
@@ -98,10 +106,12 @@ impl ::prost::Name for AuthorizeValidatorVoteRequest {
     const NAME: &'static str = "AuthorizeValidatorVoteRequest";
     const PACKAGE: &'static str = "penumbra.custody.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.v1.{}", Self::NAME)
+        "penumbra.custody.v1.AuthorizeValidatorVoteRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.v1.AuthorizeValidatorVoteRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuthorizeValidatorVoteResponse {
     /// The authorization signature for the validator vote.
@@ -114,14 +124,16 @@ impl ::prost::Name for AuthorizeValidatorVoteResponse {
     const NAME: &'static str = "AuthorizeValidatorVoteResponse";
     const PACKAGE: &'static str = "penumbra.custody.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.v1.{}", Self::NAME)
+        "penumbra.custody.v1.AuthorizeValidatorVoteResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.v1.AuthorizeValidatorVoteResponse".into()
     }
 }
 /// A pre-authorization packet.  This allows a custodian to delegate (partial)
 /// signing authority to other authorization mechanisms.  Details of how a
 /// custodian manages those keys are out-of-scope for the custody protocol and
 /// are custodian-specific.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PreAuthorization {
     #[prost(oneof = "pre_authorization::PreAuthorization", tags = "1")]
@@ -131,7 +143,6 @@ pub struct PreAuthorization {
 pub mod pre_authorization {
     /// An Ed25519-based preauthorization, containing an Ed25519 signature over the
     /// `TransactionPlan`.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Ed25519 {
         /// The Ed25519 verification key used to verify the signature.
@@ -145,12 +156,12 @@ pub mod pre_authorization {
         const NAME: &'static str = "Ed25519";
         const PACKAGE: &'static str = "penumbra.custody.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.custody.v1.PreAuthorization.{}", Self::NAME
-            )
+            "penumbra.custody.v1.PreAuthorization.Ed25519".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.custody.v1.PreAuthorization.Ed25519".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum PreAuthorization {
         #[prost(message, tag = "1")]
@@ -161,20 +172,24 @@ impl ::prost::Name for PreAuthorization {
     const NAME: &'static str = "PreAuthorization";
     const PACKAGE: &'static str = "penumbra.custody.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.v1.{}", Self::NAME)
+        "penumbra.custody.v1.PreAuthorization".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.v1.PreAuthorization".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ExportFullViewingKeyRequest {}
 impl ::prost::Name for ExportFullViewingKeyRequest {
     const NAME: &'static str = "ExportFullViewingKeyRequest";
     const PACKAGE: &'static str = "penumbra.custody.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.v1.{}", Self::NAME)
+        "penumbra.custody.v1.ExportFullViewingKeyRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.v1.ExportFullViewingKeyRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ExportFullViewingKeyResponse {
     /// The full viewing key.
@@ -187,10 +202,12 @@ impl ::prost::Name for ExportFullViewingKeyResponse {
     const NAME: &'static str = "ExportFullViewingKeyResponse";
     const PACKAGE: &'static str = "penumbra.custody.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.v1.{}", Self::NAME)
+        "penumbra.custody.v1.ExportFullViewingKeyResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.v1.ExportFullViewingKeyResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ConfirmAddressRequest {
     #[prost(message, optional, tag = "1")]
@@ -202,10 +219,12 @@ impl ::prost::Name for ConfirmAddressRequest {
     const NAME: &'static str = "ConfirmAddressRequest";
     const PACKAGE: &'static str = "penumbra.custody.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.v1.{}", Self::NAME)
+        "penumbra.custody.v1.ConfirmAddressRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.v1.ConfirmAddressRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ConfirmAddressResponse {
     #[prost(message, optional, tag = "1")]
@@ -215,13 +234,22 @@ impl ::prost::Name for ConfirmAddressResponse {
     const NAME: &'static str = "ConfirmAddressResponse";
     const PACKAGE: &'static str = "penumbra.custody.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.custody.v1.{}", Self::NAME)
+        "penumbra.custody.v1.ConfirmAddressResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.custody.v1.ConfirmAddressResponse".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod custody_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// The custody protocol is used by a wallet client to request authorization for
@@ -254,8 +282,8 @@ pub mod custody_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -280,7 +308,7 @@ pub mod custody_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             CustodyServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -327,8 +355,7 @@ pub mod custody_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -355,8 +382,7 @@ pub mod custody_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -386,8 +412,7 @@ pub mod custody_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -420,8 +445,7 @@ pub mod custody_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -456,8 +480,7 @@ pub mod custody_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -480,11 +503,17 @@ pub mod custody_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod custody_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with CustodyServiceServer.
     #[async_trait]
-    pub trait CustodyService: Send + Sync + 'static {
+    pub trait CustodyService: std::marker::Send + std::marker::Sync + 'static {
         /// Requests authorization of the transaction with the given description.
         async fn authorize(
             &self,
@@ -546,20 +575,18 @@ pub mod custody_service_server {
     /// understand the transaction and determine whether or not it should be
     /// authorized.
     #[derive(Debug)]
-    pub struct CustodyServiceServer<T: CustodyService> {
-        inner: _Inner<T>,
+    pub struct CustodyServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: CustodyService> CustodyServiceServer<T> {
+    impl<T> CustodyServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -609,8 +636,8 @@ pub mod custody_service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for CustodyServiceServer<T>
     where
         T: CustodyService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -622,7 +649,6 @@ pub mod custody_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.custody.v1.CustodyService/Authorize" => {
                     #[allow(non_camel_case_types)]
@@ -653,7 +679,6 @@ pub mod custody_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AuthorizeSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -708,7 +733,6 @@ pub mod custody_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AuthorizeValidatorDefinitionSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -758,7 +782,6 @@ pub mod custody_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AuthorizeValidatorVoteSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -808,7 +831,6 @@ pub mod custody_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ExportFullViewingKeySvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -855,7 +877,6 @@ pub mod custody_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ConfirmAddressSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -874,20 +895,25 @@ pub mod custody_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: CustodyService> Clone for CustodyServiceServer<T> {
+    impl<T> Clone for CustodyServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -899,17 +925,9 @@ pub mod custody_service_server {
             }
         }
     }
-    impl<T: CustodyService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: CustodyService> tonic::server::NamedService for CustodyServiceServer<T> {
-        const NAME: &'static str = "penumbra.custody.v1.CustodyService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.custody.v1.CustodyService";
+    impl<T> tonic::server::NamedService for CustodyServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.custody.v1.serde.rs b/crates/proto/src/gen/penumbra.custody.v1.serde.rs
index 2b510aa434..86de4fb40e 100644
--- a/crates/proto/src/gen/penumbra.custody.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.custody.v1.serde.rs
@@ -1102,10 +1102,12 @@ impl serde::Serialize for pre_authorization::Ed25519 {
         let mut struct_ser = serializer.serialize_struct("penumbra.custody.v1.PreAuthorization.Ed25519", len)?;
         if !self.vk.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("vk", pbjson::private::base64::encode(&self.vk).as_str())?;
         }
         if !self.sig.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("sig", pbjson::private::base64::encode(&self.sig).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.tools.summoning.v1.rs b/crates/proto/src/gen/penumbra.tools.summoning.v1.rs
index b9ab44a091..8a41149ef6 100644
--- a/crates/proto/src/gen/penumbra.tools.summoning.v1.rs
+++ b/crates/proto/src/gen/penumbra.tools.summoning.v1.rs
@@ -1,4 +1,4 @@
-#[allow(clippy::derive_partial_eq_without_eq)]
+// This file is @generated by prost-build.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ParticipateRequest {
     #[prost(oneof = "participate_request::Msg", tags = "1, 2")]
@@ -7,7 +7,6 @@ pub struct ParticipateRequest {
 /// Nested message and enum types in `ParticipateRequest`.
 pub mod participate_request {
     /// Sent at the beginning of the connection to identify the participant.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Identify {
         #[prost(message, optional, tag = "1")]
@@ -19,13 +18,13 @@ pub mod participate_request {
         const NAME: &'static str = "Identify";
         const PACKAGE: &'static str = "penumbra.tools.summoning.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.tools.summoning.v1.ParticipateRequest.{}", Self::NAME
-            )
+            "penumbra.tools.summoning.v1.ParticipateRequest.Identify".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.tools.summoning.v1.ParticipateRequest.Identify".into()
         }
     }
     /// Sent by the participant after getting a `ContributeNow` message.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Contribution {
         #[prost(message, optional, tag = "1")]
@@ -39,12 +38,12 @@ pub mod participate_request {
         const NAME: &'static str = "Contribution";
         const PACKAGE: &'static str = "penumbra.tools.summoning.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.tools.summoning.v1.ParticipateRequest.{}", Self::NAME
-            )
+            "penumbra.tools.summoning.v1.ParticipateRequest.Contribution".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.tools.summoning.v1.ParticipateRequest.Contribution".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Msg {
         #[prost(message, tag = "1")]
@@ -57,10 +56,12 @@ impl ::prost::Name for ParticipateRequest {
     const NAME: &'static str = "ParticipateRequest";
     const PACKAGE: &'static str = "penumbra.tools.summoning.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.tools.summoning.v1.{}", Self::NAME)
+        "penumbra.tools.summoning.v1.ParticipateRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.tools.summoning.v1.ParticipateRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CeremonyCrs {
     #[prost(bytes = "vec", tag = "100")]
@@ -82,10 +83,12 @@ impl ::prost::Name for CeremonyCrs {
     const NAME: &'static str = "CeremonyCrs";
     const PACKAGE: &'static str = "penumbra.tools.summoning.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.tools.summoning.v1.{}", Self::NAME)
+        "penumbra.tools.summoning.v1.CeremonyCrs".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.tools.summoning.v1.CeremonyCrs".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CeremonyLinkingProof {
     #[prost(bytes = "vec", tag = "100")]
@@ -107,10 +110,12 @@ impl ::prost::Name for CeremonyLinkingProof {
     const NAME: &'static str = "CeremonyLinkingProof";
     const PACKAGE: &'static str = "penumbra.tools.summoning.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.tools.summoning.v1.{}", Self::NAME)
+        "penumbra.tools.summoning.v1.CeremonyLinkingProof".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.tools.summoning.v1.CeremonyLinkingProof".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CeremonyParentHashes {
     #[prost(bytes = "vec", tag = "100")]
@@ -132,10 +137,12 @@ impl ::prost::Name for CeremonyParentHashes {
     const NAME: &'static str = "CeremonyParentHashes";
     const PACKAGE: &'static str = "penumbra.tools.summoning.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.tools.summoning.v1.{}", Self::NAME)
+        "penumbra.tools.summoning.v1.CeremonyParentHashes".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.tools.summoning.v1.CeremonyParentHashes".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ParticipateResponse {
     #[prost(oneof = "participate_response::Msg", tags = "1, 2, 3")]
@@ -144,8 +151,7 @@ pub struct ParticipateResponse {
 /// Nested message and enum types in `ParticipateResponse`.
 pub mod participate_response {
     /// Streamed to the participant to inform them of their position in the queue.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct Position {
         /// The position of the participant in the queue.
         #[prost(uint32, tag = "1")]
@@ -168,13 +174,13 @@ pub mod participate_response {
         const NAME: &'static str = "Position";
         const PACKAGE: &'static str = "penumbra.tools.summoning.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.tools.summoning.v1.ParticipateResponse.{}", Self::NAME
-            )
+            "penumbra.tools.summoning.v1.ParticipateResponse.Position".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.tools.summoning.v1.ParticipateResponse.Position".into()
         }
     }
     /// Sent to the participant to inform them that they should contribute now.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct ContributeNow {
         /// The most recent CRS, which the participant should update.
@@ -185,14 +191,14 @@ pub mod participate_response {
         const NAME: &'static str = "ContributeNow";
         const PACKAGE: &'static str = "penumbra.tools.summoning.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.tools.summoning.v1.ParticipateResponse.{}", Self::NAME
-            )
+            "penumbra.tools.summoning.v1.ParticipateResponse.ContributeNow".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.tools.summoning.v1.ParticipateResponse.ContributeNow".into()
         }
     }
     /// Sent to the participant to confim their contribution was accepted.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct Confirm {
         #[prost(uint64, tag = "1")]
         pub slot: u64,
@@ -201,12 +207,12 @@ pub mod participate_response {
         const NAME: &'static str = "Confirm";
         const PACKAGE: &'static str = "penumbra.tools.summoning.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.tools.summoning.v1.ParticipateResponse.{}", Self::NAME
-            )
+            "penumbra.tools.summoning.v1.ParticipateResponse.Confirm".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.tools.summoning.v1.ParticipateResponse.Confirm".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Msg {
         #[prost(message, tag = "1")]
@@ -221,13 +227,22 @@ impl ::prost::Name for ParticipateResponse {
     const NAME: &'static str = "ParticipateResponse";
     const PACKAGE: &'static str = "penumbra.tools.summoning.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.tools.summoning.v1.{}", Self::NAME)
+        "penumbra.tools.summoning.v1.ParticipateResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.tools.summoning.v1.ParticipateResponse".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod ceremony_coordinator_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Runs a Phase 2 MPC ceremony with dynamic slot allocation.
@@ -250,8 +265,8 @@ pub mod ceremony_coordinator_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -276,7 +291,7 @@ pub mod ceremony_coordinator_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             CeremonyCoordinatorServiceClient::new(
                 InterceptedService::new(inner, interceptor),
@@ -338,8 +353,7 @@ pub mod ceremony_coordinator_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -362,16 +376,22 @@ pub mod ceremony_coordinator_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod ceremony_coordinator_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with CeremonyCoordinatorServiceServer.
     #[async_trait]
-    pub trait CeremonyCoordinatorService: Send + Sync + 'static {
+    pub trait CeremonyCoordinatorService: std::marker::Send + std::marker::Sync + 'static {
         /// Server streaming response type for the Participate method.
         type ParticipateStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::ParticipateResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// The protocol used to participate in the ceremony.
         ///
@@ -395,20 +415,18 @@ pub mod ceremony_coordinator_service_server {
     }
     /// Runs a Phase 2 MPC ceremony with dynamic slot allocation.
     #[derive(Debug)]
-    pub struct CeremonyCoordinatorServiceServer<T: CeremonyCoordinatorService> {
-        inner: _Inner<T>,
+    pub struct CeremonyCoordinatorServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: CeremonyCoordinatorService> CeremonyCoordinatorServiceServer<T> {
+    impl<T> CeremonyCoordinatorServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -459,8 +477,8 @@ pub mod ceremony_coordinator_service_server {
     for CeremonyCoordinatorServiceServer<T>
     where
         T: CeremonyCoordinatorService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -472,7 +490,6 @@ pub mod ceremony_coordinator_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.tools.summoning.v1.CeremonyCoordinatorService/Participate" => {
                     #[allow(non_camel_case_types)]
@@ -510,7 +527,6 @@ pub mod ceremony_coordinator_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ParticipateSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -529,20 +545,25 @@ pub mod ceremony_coordinator_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: CeremonyCoordinatorService> Clone for CeremonyCoordinatorServiceServer<T> {
+    impl<T> Clone for CeremonyCoordinatorServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -554,18 +575,9 @@ pub mod ceremony_coordinator_service_server {
             }
         }
     }
-    impl<T: CeremonyCoordinatorService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: CeremonyCoordinatorService> tonic::server::NamedService
-    for CeremonyCoordinatorServiceServer<T> {
-        const NAME: &'static str = "penumbra.tools.summoning.v1.CeremonyCoordinatorService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.tools.summoning.v1.CeremonyCoordinatorService";
+    impl<T> tonic::server::NamedService for CeremonyCoordinatorServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.tools.summoning.v1.serde.rs b/crates/proto/src/gen/penumbra.tools.summoning.v1.serde.rs
index 5864da3de6..8b47ad338f 100644
--- a/crates/proto/src/gen/penumbra.tools.summoning.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.tools.summoning.v1.serde.rs
@@ -30,30 +30,37 @@ impl serde::Serialize for CeremonyCrs {
         let mut struct_ser = serializer.serialize_struct("penumbra.tools.summoning.v1.CeremonyCrs", len)?;
         if !self.spend.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("spend", pbjson::private::base64::encode(&self.spend).as_str())?;
         }
         if !self.output.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("output", pbjson::private::base64::encode(&self.output).as_str())?;
         }
         if !self.delegator_vote.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("delegatorVote", pbjson::private::base64::encode(&self.delegator_vote).as_str())?;
         }
         if !self.undelegate_claim.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("undelegateClaim", pbjson::private::base64::encode(&self.undelegate_claim).as_str())?;
         }
         if !self.swap.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("swap", pbjson::private::base64::encode(&self.swap).as_str())?;
         }
         if !self.swap_claim.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("swapClaim", pbjson::private::base64::encode(&self.swap_claim).as_str())?;
         }
         if !self.nullifer_derivation_crs.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("nulliferDerivationCrs", pbjson::private::base64::encode(&self.nullifer_derivation_crs).as_str())?;
         }
         struct_ser.end()
@@ -252,30 +259,37 @@ impl serde::Serialize for CeremonyLinkingProof {
         let mut struct_ser = serializer.serialize_struct("penumbra.tools.summoning.v1.CeremonyLinkingProof", len)?;
         if !self.spend.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("spend", pbjson::private::base64::encode(&self.spend).as_str())?;
         }
         if !self.output.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("output", pbjson::private::base64::encode(&self.output).as_str())?;
         }
         if !self.delegator_vote.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("delegatorVote", pbjson::private::base64::encode(&self.delegator_vote).as_str())?;
         }
         if !self.undelegate_claim.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("undelegateClaim", pbjson::private::base64::encode(&self.undelegate_claim).as_str())?;
         }
         if !self.swap.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("swap", pbjson::private::base64::encode(&self.swap).as_str())?;
         }
         if !self.swap_claim.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("swapClaim", pbjson::private::base64::encode(&self.swap_claim).as_str())?;
         }
         if !self.nullifer_derivation_crs.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("nulliferDerivationCrs", pbjson::private::base64::encode(&self.nullifer_derivation_crs).as_str())?;
         }
         struct_ser.end()
@@ -474,30 +488,37 @@ impl serde::Serialize for CeremonyParentHashes {
         let mut struct_ser = serializer.serialize_struct("penumbra.tools.summoning.v1.CeremonyParentHashes", len)?;
         if !self.spend.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("spend", pbjson::private::base64::encode(&self.spend).as_str())?;
         }
         if !self.output.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("output", pbjson::private::base64::encode(&self.output).as_str())?;
         }
         if !self.delegator_vote.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("delegatorVote", pbjson::private::base64::encode(&self.delegator_vote).as_str())?;
         }
         if !self.undelegate_claim.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("undelegateClaim", pbjson::private::base64::encode(&self.undelegate_claim).as_str())?;
         }
         if !self.swap.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("swap", pbjson::private::base64::encode(&self.swap).as_str())?;
         }
         if !self.swap_claim.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("swapClaim", pbjson::private::base64::encode(&self.swap_claim).as_str())?;
         }
         if !self.nullifer_derivation_crs.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("nulliferDerivationCrs", pbjson::private::base64::encode(&self.nullifer_derivation_crs).as_str())?;
         }
         struct_ser.end()
@@ -1144,6 +1165,7 @@ impl serde::Serialize for participate_response::Confirm {
         let mut struct_ser = serializer.serialize_struct("penumbra.tools.summoning.v1.ParticipateResponse.Confirm", len)?;
         if self.slot != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("slot", ToString::to_string(&self.slot).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/penumbra.util.tendermint_proxy.v1.rs b/crates/proto/src/gen/penumbra.util.tendermint_proxy.v1.rs
index 21e813cb1f..97a472b1ed 100644
--- a/crates/proto/src/gen/penumbra.util.tendermint_proxy.v1.rs
+++ b/crates/proto/src/gen/penumbra.util.tendermint_proxy.v1.rs
@@ -1,5 +1,5 @@
+// This file is @generated by prost-build.
 /// GetTxRequest is the request type for the GetTx RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetTxRequest {
     /// Hash of transaction to retrieve
@@ -13,11 +13,13 @@ impl ::prost::Name for GetTxRequest {
     const NAME: &'static str = "GetTxRequest";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.GetTxRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.GetTxRequest".into()
     }
 }
 /// GetTxResponse is the response type for the GetTx RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetTxResponse {
     /// Hash of transaction
@@ -36,10 +38,12 @@ impl ::prost::Name for GetTxResponse {
     const NAME: &'static str = "GetTxResponse";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.GetTxResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.GetTxResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxResult {
     #[prost(string, tag = "1")]
@@ -55,10 +59,12 @@ impl ::prost::Name for TxResult {
     const NAME: &'static str = "TxResult";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.TxResult".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.TxResult".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Tag {
     #[prost(bytes = "vec", tag = "1")]
@@ -72,11 +78,13 @@ impl ::prost::Name for Tag {
     const NAME: &'static str = "Tag";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.Tag".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.Tag".into()
     }
 }
 /// BroadcastTxAsyncRequest is the request type for the BroadcastTxAsync RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BroadcastTxAsyncRequest {
     #[prost(bytes = "vec", tag = "1")]
@@ -88,11 +96,13 @@ impl ::prost::Name for BroadcastTxAsyncRequest {
     const NAME: &'static str = "BroadcastTxAsyncRequest";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.BroadcastTxAsyncRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.BroadcastTxAsyncRequest".into()
     }
 }
 /// BroadcastTxAsyncResponse is the response type for the BroadcastTxAsync RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BroadcastTxAsyncResponse {
     #[prost(uint64, tag = "1")]
@@ -108,11 +118,13 @@ impl ::prost::Name for BroadcastTxAsyncResponse {
     const NAME: &'static str = "BroadcastTxAsyncResponse";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.BroadcastTxAsyncResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.BroadcastTxAsyncResponse".into()
     }
 }
 /// BroadcastTxSyncRequest is the request type for the BroadcastTxSync RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BroadcastTxSyncRequest {
     #[prost(bytes = "vec", tag = "1")]
@@ -124,11 +136,13 @@ impl ::prost::Name for BroadcastTxSyncRequest {
     const NAME: &'static str = "BroadcastTxSyncRequest";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.BroadcastTxSyncRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.BroadcastTxSyncRequest".into()
     }
 }
 /// BroadcastTxSyncResponse is the response type for the BroadcastTxSync RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BroadcastTxSyncResponse {
     #[prost(uint64, tag = "1")]
@@ -144,22 +158,26 @@ impl ::prost::Name for BroadcastTxSyncResponse {
     const NAME: &'static str = "BroadcastTxSyncResponse";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.BroadcastTxSyncResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.BroadcastTxSyncResponse".into()
     }
 }
 /// GetStatusRequest is the request type for the Query/GetStatus RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct GetStatusRequest {}
 impl ::prost::Name for GetStatusRequest {
     const NAME: &'static str = "GetStatusRequest";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.GetStatusRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.GetStatusRequest".into()
     }
 }
 /// GetStatusResponse is the response type for the Query/GetStatus RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetStatusResponse {
     #[prost(message, optional, tag = "1")]
@@ -177,10 +195,12 @@ impl ::prost::Name for GetStatusResponse {
     const NAME: &'static str = "GetStatusResponse";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.GetStatusResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.GetStatusResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncInfo {
     #[prost(bytes = "vec", tag = "1")]
@@ -204,11 +224,13 @@ impl ::prost::Name for SyncInfo {
     const NAME: &'static str = "SyncInfo";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.SyncInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.SyncInfo".into()
     }
 }
 /// ABCIQueryRequest defines the request structure for the ABCIQuery gRPC query.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AbciQueryRequest {
     #[prost(bytes = "vec", tag = "1")]
@@ -224,14 +246,16 @@ impl ::prost::Name for AbciQueryRequest {
     const NAME: &'static str = "ABCIQueryRequest";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.ABCIQueryRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.ABCIQueryRequest".into()
     }
 }
 /// ABCIQueryResponse defines the response structure for the ABCIQuery gRPC query.
 ///
 /// Note: This type is a duplicate of the ResponseQuery proto type defined in
 /// Tendermint.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AbciQueryResponse {
     #[prost(uint32, tag = "1")]
@@ -261,12 +285,14 @@ impl ::prost::Name for AbciQueryResponse {
     const NAME: &'static str = "ABCIQueryResponse";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.ABCIQueryResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.ABCIQueryResponse".into()
     }
 }
 /// GetBlockByHeightRequest is the request type for the Query/GetBlockByHeight RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct GetBlockByHeightRequest {
     #[prost(int64, tag = "1")]
     pub height: i64,
@@ -275,11 +301,13 @@ impl ::prost::Name for GetBlockByHeightRequest {
     const NAME: &'static str = "GetBlockByHeightRequest";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.GetBlockByHeightRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.GetBlockByHeightRequest".into()
     }
 }
 /// GetBlockByHeightResponse is the response type for the Query/GetBlockByHeight RPC method.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetBlockByHeightResponse {
     #[prost(message, optional, tag = "1")]
@@ -295,13 +323,22 @@ impl ::prost::Name for GetBlockByHeightResponse {
     const NAME: &'static str = "GetBlockByHeightResponse";
     const PACKAGE: &'static str = "penumbra.util.tendermint_proxy.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.util.tendermint_proxy.v1.{}", Self::NAME)
+        "penumbra.util.tendermint_proxy.v1.GetBlockByHeightResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.util.tendermint_proxy.v1.GetBlockByHeightResponse".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod tendermint_proxy_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// Defines the gRPC query service for proxying requests to an upstream Tendermint RPC.
@@ -324,8 +361,8 @@ pub mod tendermint_proxy_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -350,7 +387,7 @@ pub mod tendermint_proxy_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             TendermintProxyServiceClient::new(
                 InterceptedService::new(inner, interceptor),
@@ -399,8 +436,7 @@ pub mod tendermint_proxy_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -430,8 +466,7 @@ pub mod tendermint_proxy_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -461,8 +496,7 @@ pub mod tendermint_proxy_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -489,8 +523,7 @@ pub mod tendermint_proxy_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -522,8 +555,7 @@ pub mod tendermint_proxy_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -553,8 +585,7 @@ pub mod tendermint_proxy_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -577,11 +608,17 @@ pub mod tendermint_proxy_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod tendermint_proxy_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with TendermintProxyServiceServer.
     #[async_trait]
-    pub trait TendermintProxyService: Send + Sync + 'static {
+    pub trait TendermintProxyService: std::marker::Send + std::marker::Sync + 'static {
         /// Status queries the current status.
         async fn get_status(
             &self,
@@ -632,20 +669,18 @@ pub mod tendermint_proxy_service_server {
     }
     /// Defines the gRPC query service for proxying requests to an upstream Tendermint RPC.
     #[derive(Debug)]
-    pub struct TendermintProxyServiceServer<T: TendermintProxyService> {
-        inner: _Inner<T>,
+    pub struct TendermintProxyServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: TendermintProxyService> TendermintProxyServiceServer<T> {
+    impl<T> TendermintProxyServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -696,8 +731,8 @@ pub mod tendermint_proxy_service_server {
     for TendermintProxyServiceServer<T>
     where
         T: TendermintProxyService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -709,7 +744,6 @@ pub mod tendermint_proxy_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.util.tendermint_proxy.v1.TendermintProxyService/GetStatus" => {
                     #[allow(non_camel_case_types)]
@@ -741,7 +775,6 @@ pub mod tendermint_proxy_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = GetStatusSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -791,7 +824,6 @@ pub mod tendermint_proxy_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = BroadcastTxAsyncSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -841,7 +873,6 @@ pub mod tendermint_proxy_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = BroadcastTxSyncSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -886,7 +917,6 @@ pub mod tendermint_proxy_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = GetTxSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -933,7 +963,6 @@ pub mod tendermint_proxy_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ABCIQuerySvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -983,7 +1012,6 @@ pub mod tendermint_proxy_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = GetBlockByHeightSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1002,20 +1030,25 @@ pub mod tendermint_proxy_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: TendermintProxyService> Clone for TendermintProxyServiceServer<T> {
+    impl<T> Clone for TendermintProxyServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -1027,18 +1060,9 @@ pub mod tendermint_proxy_service_server {
             }
         }
     }
-    impl<T: TendermintProxyService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: TendermintProxyService> tonic::server::NamedService
-    for TendermintProxyServiceServer<T> {
-        const NAME: &'static str = "penumbra.util.tendermint_proxy.v1.TendermintProxyService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.util.tendermint_proxy.v1.TendermintProxyService";
+    impl<T> tonic::server::NamedService for TendermintProxyServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.util.tendermint_proxy.v1.serde.rs b/crates/proto/src/gen/penumbra.util.tendermint_proxy.v1.serde.rs
index 592140e6c7..e2e0d3373e 100644
--- a/crates/proto/src/gen/penumbra.util.tendermint_proxy.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.util.tendermint_proxy.v1.serde.rs
@@ -21,6 +21,7 @@ impl serde::Serialize for AbciQueryRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.util.tendermint_proxy.v1.ABCIQueryRequest", len)?;
         if !self.data.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("data", pbjson::private::base64::encode(&self.data).as_str())?;
         }
         if !self.path.is_empty() {
@@ -28,6 +29,7 @@ impl serde::Serialize for AbciQueryRequest {
         }
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         if self.prove {
@@ -167,10 +169,12 @@ impl serde::Serialize for BroadcastTxAsyncRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.util.tendermint_proxy.v1.BroadcastTxAsyncRequest", len)?;
         if !self.params.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("params", pbjson::private::base64::encode(&self.params).as_str())?;
         }
         if self.req_id != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("reqId", ToString::to_string(&self.req_id).as_str())?;
         }
         struct_ser.end()
@@ -292,10 +296,12 @@ impl serde::Serialize for BroadcastTxAsyncResponse {
         let mut struct_ser = serializer.serialize_struct("penumbra.util.tendermint_proxy.v1.BroadcastTxAsyncResponse", len)?;
         if self.code != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("code", ToString::to_string(&self.code).as_str())?;
         }
         if !self.data.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("data", pbjson::private::base64::encode(&self.data).as_str())?;
         }
         if !self.log.is_empty() {
@@ -303,6 +309,7 @@ impl serde::Serialize for BroadcastTxAsyncResponse {
         }
         if !self.hash.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("hash", pbjson::private::base64::encode(&self.hash).as_str())?;
         }
         struct_ser.end()
@@ -441,10 +448,12 @@ impl serde::Serialize for BroadcastTxSyncRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.util.tendermint_proxy.v1.BroadcastTxSyncRequest", len)?;
         if !self.params.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("params", pbjson::private::base64::encode(&self.params).as_str())?;
         }
         if self.req_id != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("reqId", ToString::to_string(&self.req_id).as_str())?;
         }
         struct_ser.end()
@@ -566,10 +575,12 @@ impl serde::Serialize for BroadcastTxSyncResponse {
         let mut struct_ser = serializer.serialize_struct("penumbra.util.tendermint_proxy.v1.BroadcastTxSyncResponse", len)?;
         if self.code != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("code", ToString::to_string(&self.code).as_str())?;
         }
         if !self.data.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("data", pbjson::private::base64::encode(&self.data).as_str())?;
         }
         if !self.log.is_empty() {
@@ -577,6 +588,7 @@ impl serde::Serialize for BroadcastTxSyncResponse {
         }
         if !self.hash.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("hash", pbjson::private::base64::encode(&self.hash).as_str())?;
         }
         struct_ser.end()
@@ -712,6 +724,7 @@ impl serde::Serialize for GetBlockByHeightRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.util.tendermint_proxy.v1.GetBlockByHeightRequest", len)?;
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         struct_ser.end()
@@ -885,6 +898,7 @@ impl serde::Serialize for GetTxRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.util.tendermint_proxy.v1.GetTxRequest", len)?;
         if !self.hash.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("hash", pbjson::private::base64::encode(&self.hash).as_str())?;
         }
         if self.prove {
@@ -1009,14 +1023,17 @@ impl serde::Serialize for GetTxResponse {
         let mut struct_ser = serializer.serialize_struct("penumbra.util.tendermint_proxy.v1.GetTxResponse", len)?;
         if !self.hash.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("hash", pbjson::private::base64::encode(&self.hash).as_str())?;
         }
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         if self.index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("index", ToString::to_string(&self.index).as_str())?;
         }
         if let Some(v) = self.tx_result.as_ref() {
@@ -1024,6 +1041,7 @@ impl serde::Serialize for GetTxResponse {
         }
         if !self.tx.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("tx", pbjson::private::base64::encode(&self.tx).as_str())?;
         }
         struct_ser.end()
@@ -1185,14 +1203,17 @@ impl serde::Serialize for SyncInfo {
         let mut struct_ser = serializer.serialize_struct("penumbra.util.tendermint_proxy.v1.SyncInfo", len)?;
         if !self.latest_block_hash.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("latestBlockHash", pbjson::private::base64::encode(&self.latest_block_hash).as_str())?;
         }
         if !self.latest_app_hash.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("latestAppHash", pbjson::private::base64::encode(&self.latest_app_hash).as_str())?;
         }
         if self.latest_block_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("latestBlockHeight", ToString::to_string(&self.latest_block_height).as_str())?;
         }
         if let Some(v) = self.latest_block_time.as_ref() {
@@ -1356,10 +1377,12 @@ impl serde::Serialize for Tag {
         let mut struct_ser = serializer.serialize_struct("penumbra.util.tendermint_proxy.v1.Tag", len)?;
         if !self.key.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("key", pbjson::private::base64::encode(&self.key).as_str())?;
         }
         if !self.value.is_empty() {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("value", pbjson::private::base64::encode(&self.value).as_str())?;
         }
         if self.index {
@@ -1497,10 +1520,12 @@ impl serde::Serialize for TxResult {
         }
         if self.gas_wanted != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("gasWanted", ToString::to_string(&self.gas_wanted).as_str())?;
         }
         if self.gas_used != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("gasUsed", ToString::to_string(&self.gas_used).as_str())?;
         }
         if !self.tags.is_empty() {
diff --git a/crates/proto/src/gen/penumbra.view.v1.rs b/crates/proto/src/gen/penumbra.view.v1.rs
index 5ec54bf491..8dd6ff3157 100644
--- a/crates/proto/src/gen/penumbra.view.v1.rs
+++ b/crates/proto/src/gen/penumbra.view.v1.rs
@@ -1,16 +1,18 @@
+// This file is @generated by prost-build.
 /// There's only one transparent address per wallet, so this request has no parameters;
 /// the message exists to satisfy forward-compatibility properties.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct TransparentAddressRequest {}
 impl ::prost::Name for TransparentAddressRequest {
     const NAME: &'static str = "TransparentAddressRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.TransparentAddressRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.TransparentAddressRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransparentAddressResponse {
     /// The raw (binary) transparent address
@@ -24,12 +26,14 @@ impl ::prost::Name for TransparentAddressResponse {
     const NAME: &'static str = "TransparentAddressResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.TransparentAddressResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.TransparentAddressResponse".into()
     }
 }
 /// Filters in an `AuctionsRequest` will be combined using `AND` logic -- that
 /// is, the more filters you add, the fewer responses you're likely to get.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuctionsRequest {
     /// If present, filter balances to only include the account specified by the `AddressIndex`.
@@ -53,10 +57,12 @@ impl ::prost::Name for AuctionsRequest {
     const NAME: &'static str = "AuctionsRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.AuctionsRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.AuctionsRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuctionsResponse {
     #[prost(message, optional, tag = "1")]
@@ -95,10 +101,12 @@ impl ::prost::Name for AuctionsResponse {
     const NAME: &'static str = "AuctionsResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.AuctionsResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.AuctionsResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuthorizeAndBuildRequest {
     /// The transaction plan to authorize and build.
@@ -111,10 +119,12 @@ impl ::prost::Name for AuthorizeAndBuildRequest {
     const NAME: &'static str = "AuthorizeAndBuildRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.AuthorizeAndBuildRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.AuthorizeAndBuildRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AuthorizeAndBuildResponse {
     #[prost(oneof = "authorize_and_build_response::Status", tags = "1, 2")]
@@ -123,8 +133,7 @@ pub struct AuthorizeAndBuildResponse {
 /// Nested message and enum types in `AuthorizeAndBuildResponse`.
 pub mod authorize_and_build_response {
     /// Signals that building is in progress.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct BuildProgress {
         /// An approximate progress of the build, from 0 to 1.
         #[prost(float, tag = "1")]
@@ -134,13 +143,13 @@ pub mod authorize_and_build_response {
         const NAME: &'static str = "BuildProgress";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.AuthorizeAndBuildResponse.{}", Self::NAME
-            )
+            "penumbra.view.v1.AuthorizeAndBuildResponse.BuildProgress".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.AuthorizeAndBuildResponse.BuildProgress".into()
         }
     }
     /// Signals that the transaction is complete.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Complete {
         /// The finished transaction.
@@ -153,12 +162,12 @@ pub mod authorize_and_build_response {
         const NAME: &'static str = "Complete";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.AuthorizeAndBuildResponse.{}", Self::NAME
-            )
+            "penumbra.view.v1.AuthorizeAndBuildResponse.Complete".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.AuthorizeAndBuildResponse.Complete".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Status {
         #[prost(message, tag = "1")]
@@ -171,10 +180,12 @@ impl ::prost::Name for AuthorizeAndBuildResponse {
     const NAME: &'static str = "AuthorizeAndBuildResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.AuthorizeAndBuildResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.AuthorizeAndBuildResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BroadcastTransactionRequest {
     /// The transaction to broadcast.
@@ -190,10 +201,12 @@ impl ::prost::Name for BroadcastTransactionRequest {
     const NAME: &'static str = "BroadcastTransactionRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.BroadcastTransactionRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.BroadcastTransactionRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BroadcastTransactionResponse {
     #[prost(oneof = "broadcast_transaction_response::Status", tags = "1, 2")]
@@ -202,7 +215,6 @@ pub struct BroadcastTransactionResponse {
 /// Nested message and enum types in `BroadcastTransactionResponse`.
 pub mod broadcast_transaction_response {
     /// Signals that the transaction was broadcast successfully (but has not been confirmed).
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct BroadcastSuccess {
         /// The hash of the transaction that was broadcast.
@@ -215,15 +227,15 @@ pub mod broadcast_transaction_response {
         const NAME: &'static str = "BroadcastSuccess";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.BroadcastTransactionResponse.{}", Self::NAME
-            )
+            "penumbra.view.v1.BroadcastTransactionResponse.BroadcastSuccess".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.BroadcastTransactionResponse.BroadcastSuccess".into()
         }
     }
     /// Signals that the transaction has been confirmed on-chain and detected by the view server.
     ///
     /// Will not be sent unless await_detection was true.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Confirmed {
         /// The hash of the transaction that was broadcast.
@@ -239,12 +251,12 @@ pub mod broadcast_transaction_response {
         const NAME: &'static str = "Confirmed";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.BroadcastTransactionResponse.{}", Self::NAME
-            )
+            "penumbra.view.v1.BroadcastTransactionResponse.Confirmed".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.BroadcastTransactionResponse.Confirmed".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Status {
         #[prost(message, tag = "1")]
@@ -257,10 +269,12 @@ impl ::prost::Name for BroadcastTransactionResponse {
     const NAME: &'static str = "BroadcastTransactionResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.BroadcastTransactionResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.BroadcastTransactionResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionPlannerRequest {
     /// The expiry height for the requested TransactionPlan
@@ -340,7 +354,6 @@ pub struct TransactionPlannerRequest {
 /// Nested message and enum types in `TransactionPlannerRequest`.
 pub mod transaction_planner_request {
     /// Request message subtypes
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Output {
         /// The amount and denomination in which the Output is issued.
@@ -356,12 +369,12 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "Output";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.Output".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.Output".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Spend {
         /// The input amount and denomination in which the Spend is issued.
@@ -377,12 +390,12 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "Spend";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.Spend".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.Spend".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Swap {
         /// The input amount and denomination to be traded in the Swap.
@@ -408,12 +421,12 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "Swap";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.Swap".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.Swap".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct SwapClaim {
         /// SwapCommitment to identify the Swap to be claimed.
@@ -428,12 +441,12 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "SwapClaim";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.SwapClaim".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.SwapClaim".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Delegate {
         #[prost(message, optional, tag = "1")]
@@ -447,12 +460,12 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "Delegate";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.Delegate".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.Delegate".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Undelegate {
         #[prost(message, optional, tag = "1")]
@@ -466,12 +479,12 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "Undelegate";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.Undelegate".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.Undelegate".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct UndelegateClaim {
         /// The identity key of the validator to finish undelegating from.
@@ -503,12 +516,12 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "UndelegateClaim";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.UndelegateClaim".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.UndelegateClaim".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct PositionOpen {
         /// Contains the data defining the position, sufficient to compute its `PositionId`.
@@ -524,12 +537,12 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "PositionOpen";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.PositionOpen".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.PositionOpen".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct PositionClose {
         /// The position to close.
@@ -542,12 +555,12 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "PositionClose";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.PositionClose".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.PositionClose".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct PositionWithdraw {
         /// The position to withdraw.
@@ -570,12 +583,12 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "PositionWithdraw";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.PositionWithdraw".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.PositionWithdraw".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct ActionDutchAuctionSchedule {
         /// The description of the auction to schedule.
@@ -588,12 +601,14 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "ActionDutchAuctionSchedule";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.ActionDutchAuctionSchedule"
+                .into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.ActionDutchAuctionSchedule"
+                .into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct ActionDutchAuctionEnd {
         /// The unique id of the auction to close.
@@ -606,12 +621,12 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "ActionDutchAuctionEnd";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.ActionDutchAuctionEnd".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.ActionDutchAuctionEnd".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct ActionDutchAuctionWithdraw {
         /// The auction to withdraw funds from.
@@ -627,12 +642,14 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "ActionDutchAuctionWithdraw";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.ActionDutchAuctionWithdraw"
+                .into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.ActionDutchAuctionWithdraw"
+                .into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct DelegatorVote {
         /// The proposal being voted on.
@@ -659,13 +676,13 @@ pub mod transaction_planner_request {
         const NAME: &'static str = "DelegatorVote";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.TransactionPlannerRequest.{}", Self::NAME
-            )
+            "penumbra.view.v1.TransactionPlannerRequest.DelegatorVote".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.TransactionPlannerRequest.DelegatorVote".into()
         }
     }
     /// Specifies either that the planner should compute fees automatically or that it should use a fixed fee amount.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum FeeMode {
         /// Automatically compute a fee based on gas use.
@@ -680,10 +697,12 @@ impl ::prost::Name for TransactionPlannerRequest {
     const NAME: &'static str = "TransactionPlannerRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.TransactionPlannerRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.TransactionPlannerRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionPlannerResponse {
     #[prost(message, optional, tag = "1")]
@@ -695,10 +714,12 @@ impl ::prost::Name for TransactionPlannerResponse {
     const NAME: &'static str = "TransactionPlannerResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.TransactionPlannerResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.TransactionPlannerResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AddressByIndexRequest {
     #[prost(message, optional, tag = "1")]
@@ -710,10 +731,12 @@ impl ::prost::Name for AddressByIndexRequest {
     const NAME: &'static str = "AddressByIndexRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.AddressByIndexRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.AddressByIndexRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AddressByIndexResponse {
     #[prost(message, optional, tag = "1")]
@@ -723,20 +746,24 @@ impl ::prost::Name for AddressByIndexResponse {
     const NAME: &'static str = "AddressByIndexResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.AddressByIndexResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.AddressByIndexResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct WalletIdRequest {}
 impl ::prost::Name for WalletIdRequest {
     const NAME: &'static str = "WalletIdRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.WalletIdRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.WalletIdRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WalletIdResponse {
     #[prost(message, optional, tag = "1")]
@@ -746,10 +773,12 @@ impl ::prost::Name for WalletIdResponse {
     const NAME: &'static str = "WalletIdResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.WalletIdResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.WalletIdResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct IndexByAddressRequest {
     #[prost(message, optional, tag = "1")]
@@ -759,10 +788,12 @@ impl ::prost::Name for IndexByAddressRequest {
     const NAME: &'static str = "IndexByAddressRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.IndexByAddressRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.IndexByAddressRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct IndexByAddressResponse {
     /// Will be absent if given an address not viewable by this viewing service
@@ -775,10 +806,12 @@ impl ::prost::Name for IndexByAddressResponse {
     const NAME: &'static str = "IndexByAddressResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.IndexByAddressResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.IndexByAddressResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EphemeralAddressRequest {
     #[prost(message, optional, tag = "1")]
@@ -790,10 +823,12 @@ impl ::prost::Name for EphemeralAddressRequest {
     const NAME: &'static str = "EphemeralAddressRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.EphemeralAddressRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.EphemeralAddressRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EphemeralAddressResponse {
     #[prost(message, optional, tag = "1")]
@@ -803,10 +838,12 @@ impl ::prost::Name for EphemeralAddressResponse {
     const NAME: &'static str = "EphemeralAddressResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.EphemeralAddressResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.EphemeralAddressResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BalancesRequest {
     /// If present, filter balances to only include the account specified by the `AddressIndex`.
@@ -822,10 +859,12 @@ impl ::prost::Name for BalancesRequest {
     const NAME: &'static str = "BalancesRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.BalancesRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.BalancesRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BalancesResponse {
     /// Deprecated: use `account_address` instead.
@@ -852,23 +891,27 @@ impl ::prost::Name for BalancesResponse {
     const NAME: &'static str = "BalancesResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.BalancesResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.BalancesResponse".into()
     }
 }
 /// Requests sync status of the view service.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct StatusRequest {}
 impl ::prost::Name for StatusRequest {
     const NAME: &'static str = "StatusRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.StatusRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.StatusRequest".into()
     }
 }
 /// Returns the status of the view service and whether it is synchronized with the chain state.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct StatusResponse {
     /// The height the view service has synchronized to so far when doing a full linear sync
     #[prost(uint64, tag = "1")]
@@ -884,23 +927,27 @@ impl ::prost::Name for StatusResponse {
     const NAME: &'static str = "StatusResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.StatusResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.StatusResponse".into()
     }
 }
 /// Requests streaming updates on the sync height until the view service is synchronized.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct StatusStreamRequest {}
 impl ::prost::Name for StatusStreamRequest {
     const NAME: &'static str = "StatusStreamRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.StatusStreamRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.StatusStreamRequest".into()
     }
 }
 /// A streaming sync status update
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct StatusStreamResponse {
     /// The latest known block height
     #[prost(uint64, tag = "1")]
@@ -916,14 +963,16 @@ impl ::prost::Name for StatusStreamResponse {
     const NAME: &'static str = "StatusStreamResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.StatusStreamResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.StatusStreamResponse".into()
     }
 }
 /// A query for notes known by the view service.
 ///
 /// This message uses the fact that all proto fields are optional
 /// to allow various filtering on the returned notes.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NotesRequest {
     /// If set, return spent notes as well as unspent notes.
@@ -947,11 +996,13 @@ impl ::prost::Name for NotesRequest {
     const NAME: &'static str = "NotesRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.NotesRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.NotesRequest".into()
     }
 }
 /// A query for notes to be used for voting on a proposal.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NotesForVotingRequest {
     /// The starting height of the proposal.
@@ -967,10 +1018,12 @@ impl ::prost::Name for NotesForVotingRequest {
     const NAME: &'static str = "NotesForVotingRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.NotesForVotingRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.NotesForVotingRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WitnessRequest {
     /// The transaction plan to witness
@@ -983,10 +1036,12 @@ impl ::prost::Name for WitnessRequest {
     const NAME: &'static str = "WitnessRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.WitnessRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.WitnessRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WitnessResponse {
     #[prost(message, optional, tag = "1")]
@@ -998,10 +1053,12 @@ impl ::prost::Name for WitnessResponse {
     const NAME: &'static str = "WitnessResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.WitnessResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.WitnessResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WitnessAndBuildRequest {
     #[prost(message, optional, tag = "1")]
@@ -1017,10 +1074,12 @@ impl ::prost::Name for WitnessAndBuildRequest {
     const NAME: &'static str = "WitnessAndBuildRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.WitnessAndBuildRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.WitnessAndBuildRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WitnessAndBuildResponse {
     #[prost(oneof = "witness_and_build_response::Status", tags = "1, 2")]
@@ -1029,8 +1088,7 @@ pub struct WitnessAndBuildResponse {
 /// Nested message and enum types in `WitnessAndBuildResponse`.
 pub mod witness_and_build_response {
     /// Signals that building is in progress.
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct BuildProgress {
         /// An approximate progress of the build, from 0 to 1.
         #[prost(float, tag = "1")]
@@ -1040,13 +1098,13 @@ pub mod witness_and_build_response {
         const NAME: &'static str = "BuildProgress";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.WitnessAndBuildResponse.{}", Self::NAME
-            )
+            "penumbra.view.v1.WitnessAndBuildResponse.BuildProgress".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.WitnessAndBuildResponse.BuildProgress".into()
         }
     }
     /// Signals that the transaction is complete.
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Complete {
         /// The finished transaction.
@@ -1059,12 +1117,12 @@ pub mod witness_and_build_response {
         const NAME: &'static str = "Complete";
         const PACKAGE: &'static str = "penumbra.view.v1";
         fn full_name() -> ::prost::alloc::string::String {
-            ::prost::alloc::format!(
-                "penumbra.view.v1.WitnessAndBuildResponse.{}", Self::NAME
-            )
+            "penumbra.view.v1.WitnessAndBuildResponse.Complete".into()
+        }
+        fn type_url() -> ::prost::alloc::string::String {
+            "/penumbra.view.v1.WitnessAndBuildResponse.Complete".into()
         }
     }
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Status {
         #[prost(message, tag = "1")]
@@ -1077,11 +1135,13 @@ impl ::prost::Name for WitnessAndBuildResponse {
     const NAME: &'static str = "WitnessAndBuildResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.WitnessAndBuildResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.WitnessAndBuildResponse".into()
     }
 }
 /// Requests all assets known to the view service.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AssetsRequest {
     /// If set to false (default), returns all assets, regardless of whether the rest of the fields of
@@ -1113,11 +1173,13 @@ impl ::prost::Name for AssetsRequest {
     const NAME: &'static str = "AssetsRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.AssetsRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.AssetsRequest".into()
     }
 }
 /// Requests all assets known to the view service.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AssetsResponse {
     #[prost(message, optional, tag = "2")]
@@ -1127,21 +1189,25 @@ impl ::prost::Name for AssetsResponse {
     const NAME: &'static str = "AssetsResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.AssetsResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.AssetsResponse".into()
     }
 }
 /// Requests the current app parameters from the view service.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct AppParametersRequest {}
 impl ::prost::Name for AppParametersRequest {
     const NAME: &'static str = "AppParametersRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.AppParametersRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.AppParametersRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AppParametersResponse {
     #[prost(message, optional, tag = "1")]
@@ -1151,21 +1217,25 @@ impl ::prost::Name for AppParametersResponse {
     const NAME: &'static str = "AppParametersResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.AppParametersResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.AppParametersResponse".into()
     }
 }
 /// Requests the current gas prices from the view service.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct GasPricesRequest {}
 impl ::prost::Name for GasPricesRequest {
     const NAME: &'static str = "GasPricesRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.GasPricesRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.GasPricesRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GasPricesResponse {
     /// The current gas prices, in the preferred (native) token.
@@ -1183,22 +1253,26 @@ impl ::prost::Name for GasPricesResponse {
     const NAME: &'static str = "GasPricesResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.GasPricesResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.GasPricesResponse".into()
     }
 }
 /// Requests the current FMD parameters from the view service.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct FmdParametersRequest {}
 impl ::prost::Name for FmdParametersRequest {
     const NAME: &'static str = "FMDParametersRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.FMDParametersRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.FMDParametersRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct FmdParametersResponse {
     #[prost(message, optional, tag = "1")]
     pub parameters: ::core::option::Option<
@@ -1209,10 +1283,12 @@ impl ::prost::Name for FmdParametersResponse {
     const NAME: &'static str = "FMDParametersResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.FMDParametersResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.FMDParametersResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NoteByCommitmentRequest {
     #[prost(message, optional, tag = "2")]
@@ -1227,10 +1303,12 @@ impl ::prost::Name for NoteByCommitmentRequest {
     const NAME: &'static str = "NoteByCommitmentRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.NoteByCommitmentRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.NoteByCommitmentRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NoteByCommitmentResponse {
     #[prost(message, optional, tag = "1")]
@@ -1240,10 +1318,12 @@ impl ::prost::Name for NoteByCommitmentResponse {
     const NAME: &'static str = "NoteByCommitmentResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.NoteByCommitmentResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.NoteByCommitmentResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapByCommitmentRequest {
     #[prost(message, optional, tag = "2")]
@@ -1258,10 +1338,12 @@ impl ::prost::Name for SwapByCommitmentRequest {
     const NAME: &'static str = "SwapByCommitmentRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.SwapByCommitmentRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.SwapByCommitmentRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapByCommitmentResponse {
     #[prost(message, optional, tag = "1")]
@@ -1271,20 +1353,24 @@ impl ::prost::Name for SwapByCommitmentResponse {
     const NAME: &'static str = "SwapByCommitmentResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.SwapByCommitmentResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.SwapByCommitmentResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct UnclaimedSwapsRequest {}
 impl ::prost::Name for UnclaimedSwapsRequest {
     const NAME: &'static str = "UnclaimedSwapsRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.UnclaimedSwapsRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.UnclaimedSwapsRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UnclaimedSwapsResponse {
     #[prost(message, optional, tag = "1")]
@@ -1294,10 +1380,12 @@ impl ::prost::Name for UnclaimedSwapsResponse {
     const NAME: &'static str = "UnclaimedSwapsResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.UnclaimedSwapsResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.UnclaimedSwapsResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NullifierStatusRequest {
     #[prost(message, optional, tag = "2")]
@@ -1311,11 +1399,13 @@ impl ::prost::Name for NullifierStatusRequest {
     const NAME: &'static str = "NullifierStatusRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.NullifierStatusRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.NullifierStatusRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct NullifierStatusResponse {
     #[prost(bool, tag = "1")]
     pub spent: bool,
@@ -1324,10 +1414,12 @@ impl ::prost::Name for NullifierStatusResponse {
     const NAME: &'static str = "NullifierStatusResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.NullifierStatusResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.NullifierStatusResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionInfoByHashRequest {
     /// The transaction hash to query for.
@@ -1338,11 +1430,13 @@ impl ::prost::Name for TransactionInfoByHashRequest {
     const NAME: &'static str = "TransactionInfoByHashRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.TransactionInfoByHashRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.TransactionInfoByHashRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct TransactionInfoRequest {
     /// If present, return only transactions after this height.
     #[prost(uint64, tag = "1")]
@@ -1355,10 +1449,12 @@ impl ::prost::Name for TransactionInfoRequest {
     const NAME: &'static str = "TransactionInfoRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.TransactionInfoRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.TransactionInfoRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionInfo {
     /// The height the transaction was included in a block, if known.
@@ -1387,10 +1483,12 @@ impl ::prost::Name for TransactionInfo {
     const NAME: &'static str = "TransactionInfo";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.TransactionInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.TransactionInfo".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionInfoResponse {
     #[prost(message, optional, tag = "1")]
@@ -1400,10 +1498,12 @@ impl ::prost::Name for TransactionInfoResponse {
     const NAME: &'static str = "TransactionInfoResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.TransactionInfoResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.TransactionInfoResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionInfoByHashResponse {
     #[prost(message, optional, tag = "1")]
@@ -1413,10 +1513,12 @@ impl ::prost::Name for TransactionInfoByHashResponse {
     const NAME: &'static str = "TransactionInfoByHashResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.TransactionInfoByHashResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.TransactionInfoByHashResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NotesResponse {
     #[prost(message, optional, tag = "1")]
@@ -1426,10 +1528,12 @@ impl ::prost::Name for NotesResponse {
     const NAME: &'static str = "NotesResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.NotesResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.NotesResponse".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NotesForVotingResponse {
     #[prost(message, optional, tag = "1")]
@@ -1441,11 +1545,13 @@ impl ::prost::Name for NotesForVotingResponse {
     const NAME: &'static str = "NotesForVotingResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.NotesForVotingResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.NotesForVotingResponse".into()
     }
 }
 /// A note plaintext with associated metadata about its status.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SpendableNoteRecord {
     /// The note commitment, identifying the note.
@@ -1492,10 +1598,12 @@ impl ::prost::Name for SpendableNoteRecord {
     const NAME: &'static str = "SpendableNoteRecord";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.SpendableNoteRecord".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.SpendableNoteRecord".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwapRecord {
     #[prost(message, optional, tag = "1")]
@@ -1527,10 +1635,12 @@ impl ::prost::Name for SwapRecord {
     const NAME: &'static str = "SwapRecord";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.SwapRecord".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.SwapRecord".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct OwnedPositionIdsRequest {
     /// If present, return only positions with this position state.
@@ -1548,10 +1658,12 @@ impl ::prost::Name for OwnedPositionIdsRequest {
     const NAME: &'static str = "OwnedPositionIdsRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.OwnedPositionIdsRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.OwnedPositionIdsRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct OwnedPositionIdsResponse {
     #[prost(message, optional, tag = "1")]
@@ -1563,11 +1675,13 @@ impl ::prost::Name for OwnedPositionIdsResponse {
     const NAME: &'static str = "OwnedPositionIdsResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.OwnedPositionIdsResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.OwnedPositionIdsResponse".into()
     }
 }
 /// Requests information on an asset by asset id
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AssetMetadataByIdRequest {
     /// The asset id to request information on.
@@ -1578,10 +1692,12 @@ impl ::prost::Name for AssetMetadataByIdRequest {
     const NAME: &'static str = "AssetMetadataByIdRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.AssetMetadataByIdRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.AssetMetadataByIdRequest".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AssetMetadataByIdResponse {
     /// If present, information on the requested asset.
@@ -1594,13 +1710,15 @@ impl ::prost::Name for AssetMetadataByIdResponse {
     const NAME: &'static str = "AssetMetadataByIdResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.AssetMetadataByIdResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.AssetMetadataByIdResponse".into()
     }
 }
 /// Requests `ValueView`s of delegation tokens for the given address index. The
 /// returned `ValueView`s will include the `ValidatorInfo` for the delegated
 /// validator in their `extended_metadata` fields.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DelegationsByAddressIndexRequest {
     /// The address index to fetch delegation balances for.
@@ -1645,11 +1763,11 @@ pub mod delegations_by_address_index_request {
         /// (if the ProtoBuf definition does not change) and safe for programmatic use.
         pub fn as_str_name(&self) -> &'static str {
             match self {
-                Filter::Unspecified => "FILTER_UNSPECIFIED",
-                Filter::AllActiveWithNonzeroBalances => {
+                Self::Unspecified => "FILTER_UNSPECIFIED",
+                Self::AllActiveWithNonzeroBalances => {
                     "FILTER_ALL_ACTIVE_WITH_NONZERO_BALANCES"
                 }
-                Filter::All => "FILTER_ALL",
+                Self::All => "FILTER_ALL",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.
@@ -1669,13 +1787,15 @@ impl ::prost::Name for DelegationsByAddressIndexRequest {
     const NAME: &'static str = "DelegationsByAddressIndexRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.DelegationsByAddressIndexRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.DelegationsByAddressIndexRequest".into()
     }
 }
 /// Contains a `ValueView` of delegation tokens for the requested address index.
 /// The `ValueView` includes the `ValidatorInfo` for the delegated validator in
 /// cits `extended_metadata` field.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DelegationsByAddressIndexResponse {
     #[prost(message, optional, tag = "1")]
@@ -1685,12 +1805,14 @@ impl ::prost::Name for DelegationsByAddressIndexResponse {
     const NAME: &'static str = "DelegationsByAddressIndexResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.DelegationsByAddressIndexResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.DelegationsByAddressIndexResponse".into()
     }
 }
 /// Requests unbonding tokens for a given address index, with optional filtering
 /// for whether the tokens are currently claimable.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UnbondingTokensByAddressIndexRequest {
     #[prost(
@@ -1738,9 +1860,9 @@ pub mod unbonding_tokens_by_address_index_request {
         /// (if the ProtoBuf definition does not change) and safe for programmatic use.
         pub fn as_str_name(&self) -> &'static str {
             match self {
-                Filter::Unspecified => "FILTER_UNSPECIFIED",
-                Filter::Claimable => "FILTER_CLAIMABLE",
-                Filter::NotYetClaimable => "FILTER_NOT_YET_CLAIMABLE",
+                Self::Unspecified => "FILTER_UNSPECIFIED",
+                Self::Claimable => "FILTER_CLAIMABLE",
+                Self::NotYetClaimable => "FILTER_NOT_YET_CLAIMABLE",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.
@@ -1758,12 +1880,14 @@ impl ::prost::Name for UnbondingTokensByAddressIndexRequest {
     const NAME: &'static str = "UnbondingTokensByAddressIndexRequest";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.UnbondingTokensByAddressIndexRequest".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.UnbondingTokensByAddressIndexRequest".into()
     }
 }
 /// Returns unbonding tokens for the given address index, optionally filtered by
 /// whether the tokens are currently claimable.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UnbondingTokensByAddressIndexResponse {
     /// A `ValueView` representing the amount of the given unbonding token.
@@ -1779,13 +1903,22 @@ impl ::prost::Name for UnbondingTokensByAddressIndexResponse {
     const NAME: &'static str = "UnbondingTokensByAddressIndexResponse";
     const PACKAGE: &'static str = "penumbra.view.v1";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME)
+        "penumbra.view.v1.UnbondingTokensByAddressIndexResponse".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/penumbra.view.v1.UnbondingTokensByAddressIndexResponse".into()
     }
 }
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod view_service_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     /// The view RPC is used by a view client, who wants to do some
@@ -1811,8 +1944,8 @@ pub mod view_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -1837,7 +1970,7 @@ pub mod view_service_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             ViewServiceClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -1881,8 +2014,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1908,8 +2040,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1935,8 +2066,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1961,8 +2091,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1990,8 +2119,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2020,8 +2148,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2048,8 +2175,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2076,8 +2202,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2102,8 +2227,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2130,8 +2254,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2158,8 +2281,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2186,8 +2308,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2212,8 +2333,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2240,8 +2360,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2269,8 +2388,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2295,8 +2413,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2323,8 +2440,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2351,8 +2467,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2379,8 +2494,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2407,8 +2521,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2439,8 +2552,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2467,8 +2579,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2495,8 +2606,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2528,8 +2638,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2560,8 +2669,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2598,8 +2706,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2630,8 +2737,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2666,8 +2772,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2700,8 +2805,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2731,8 +2835,7 @@ pub mod view_service_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -2750,11 +2853,17 @@ pub mod view_service_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod view_service_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with ViewServiceServer.
     #[async_trait]
-    pub trait ViewService: Send + Sync + 'static {
+    pub trait ViewService: std::marker::Send + std::marker::Sync + 'static {
         /// Get current status of chain sync
         async fn status(
             &self,
@@ -2764,7 +2873,7 @@ pub mod view_service_server {
         type StatusStreamStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::StatusStreamResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Stream sync status updates until the view service has caught up with the chain.
         /// Returns a stream of `StatusStreamResponse`s.
@@ -2779,7 +2888,7 @@ pub mod view_service_server {
         type NotesStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::NotesResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Queries for notes that have been accepted by the chain.
         /// Returns a stream of `NotesResponse`s.
@@ -2791,7 +2900,7 @@ pub mod view_service_server {
         type NotesForVotingStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::NotesForVotingResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Returns a stream of `NotesForVotingResponse`s.
         async fn notes_for_voting(
@@ -2805,7 +2914,7 @@ pub mod view_service_server {
         type AssetsStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::AssetsResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Queries for metadata about known assets.
         /// Returns a stream of `AssetsResponse`s.
@@ -2893,7 +3002,7 @@ pub mod view_service_server {
         type BalancesStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::BalancesResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Query for balance of a given address.
         /// Returns a stream of `BalancesResponses`.
@@ -2921,7 +3030,7 @@ pub mod view_service_server {
         type UnclaimedSwapsStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::UnclaimedSwapsResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Query for all unclaimed swaps.
         async fn unclaimed_swaps(
@@ -2951,7 +3060,7 @@ pub mod view_service_server {
         type TransactionInfoStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::TransactionInfoResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Query for the full transactions in the given range of blocks.
         /// Returns a stream of `TransactionInfoResponse`s.
@@ -2969,7 +3078,7 @@ pub mod view_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Query for owned position IDs for the given trading pair and in the given position state.
         async fn owned_position_ids(
@@ -3001,7 +3110,7 @@ pub mod view_service_server {
         type WitnessAndBuildStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::WitnessAndBuildResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Like `Witness`, but immediately uses the witness data to build (prove) the transaction.
         ///
@@ -3024,7 +3133,7 @@ pub mod view_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Authorize a transaction plan and build the transaction.
         ///
@@ -3051,7 +3160,7 @@ pub mod view_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Broadcast a transaction to the network, optionally waiting for full confirmation.
         ///
@@ -3070,7 +3179,7 @@ pub mod view_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Get delegation tokens for a given address index. Each delegation token will
         /// be represented by a `ValueView` with the given address index's balance of
@@ -3090,7 +3199,7 @@ pub mod view_service_server {
                     tonic::Status,
                 >,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Get unbonding tokens for the given address index, optionally filtered by
         /// whether the tokens are currently claimable.
@@ -3105,7 +3214,7 @@ pub mod view_service_server {
         type AuctionsStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::AuctionsResponse, tonic::Status>,
             >
-            + Send
+            + std::marker::Send
             + 'static;
         /// Gets the auctions controlled by the user's wallet.
         async fn auctions(
@@ -3118,20 +3227,18 @@ pub mod view_service_server {
     /// responsible for synchronizing and scanning the public chain state with one or
     /// more full viewing keys.
     #[derive(Debug)]
-    pub struct ViewServiceServer<T: ViewService> {
-        inner: _Inner<T>,
+    pub struct ViewServiceServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: ViewService> ViewServiceServer<T> {
+    impl<T> ViewServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -3181,8 +3288,8 @@ pub mod view_service_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for ViewServiceServer<T>
     where
         T: ViewService,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -3194,7 +3301,6 @@ pub mod view_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/penumbra.view.v1.ViewService/Status" => {
                     #[allow(non_camel_case_types)]
@@ -3225,7 +3331,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = StatusSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3272,7 +3377,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = StatusStreamSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3319,7 +3423,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = NotesSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3366,7 +3469,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = NotesForVotingSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3413,7 +3515,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AssetsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3460,7 +3561,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AssetMetadataByIdSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3506,7 +3606,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AppParametersSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3552,7 +3651,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = GasPricesSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3598,7 +3696,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = FMDParametersSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3644,7 +3741,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AddressByIndexSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3691,7 +3787,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = TransparentAddressSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3737,7 +3832,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = WalletIdSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3783,7 +3877,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = IndexByAddressSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3829,7 +3922,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = EphemeralAddressSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3876,7 +3968,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = BalancesSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3923,7 +4014,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = NoteByCommitmentSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -3970,7 +4060,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = SwapByCommitmentSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4017,7 +4106,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = UnclaimedSwapsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4063,7 +4151,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = NullifierStatusSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4113,7 +4200,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = TransactionInfoByHashSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4161,7 +4247,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = TransactionInfoSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4210,7 +4295,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = OwnedPositionIdsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4257,7 +4341,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = TransactionPlannerSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4303,7 +4386,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = WitnessSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4351,7 +4433,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = WitnessAndBuildSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4400,7 +4481,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AuthorizeAndBuildSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4449,7 +4529,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = BroadcastTransactionSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4503,7 +4582,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = DelegationsByAddressIndexSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4557,7 +4635,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = UnbondingTokensByAddressIndexSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4604,7 +4681,6 @@ pub mod view_service_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = AuctionsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -4623,20 +4699,25 @@ pub mod view_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: ViewService> Clone for ViewServiceServer<T> {
+    impl<T> Clone for ViewServiceServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -4648,17 +4729,9 @@ pub mod view_service_server {
             }
         }
     }
-    impl<T: ViewService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: ViewService> tonic::server::NamedService for ViewServiceServer<T> {
-        const NAME: &'static str = "penumbra.view.v1.ViewService";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "penumbra.view.v1.ViewService";
+    impl<T> tonic::server::NamedService for ViewServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/penumbra.view.v1.serde.rs b/crates/proto/src/gen/penumbra.view.v1.serde.rs
index d5b11ff8db..06c180beee 100644
--- a/crates/proto/src/gen/penumbra.view.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.view.v1.serde.rs
@@ -1035,6 +1035,7 @@ impl serde::Serialize for AuctionsResponse {
         }
         if self.local_seq != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("localSeq", ToString::to_string(&self.local_seq).as_str())?;
         }
         struct_ser.end()
@@ -2171,6 +2172,7 @@ impl serde::Serialize for broadcast_transaction_response::Confirmed {
         }
         if self.detection_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("detectionHeight", ToString::to_string(&self.detection_height).as_str())?;
         }
         struct_ser.end()
@@ -3514,6 +3516,7 @@ impl serde::Serialize for NotesForVotingRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.view.v1.NotesForVotingRequest", len)?;
         if self.votable_at_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("votableAtHeight", ToString::to_string(&self.votable_at_height).as_str())?;
         }
         if let Some(v) = self.address_index.as_ref() {
@@ -4442,14 +4445,17 @@ impl serde::Serialize for SpendableNoteRecord {
         }
         if self.height_created != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("heightCreated", ToString::to_string(&self.height_created).as_str())?;
         }
         if self.height_spent != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("heightSpent", ToString::to_string(&self.height_spent).as_str())?;
         }
         if self.position != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("position", ToString::to_string(&self.position).as_str())?;
         }
         if let Some(v) = self.source.as_ref() {
@@ -4729,10 +4735,12 @@ impl serde::Serialize for StatusResponse {
         let mut struct_ser = serializer.serialize_struct("penumbra.view.v1.StatusResponse", len)?;
         if self.full_sync_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("fullSyncHeight", ToString::to_string(&self.full_sync_height).as_str())?;
         }
         if self.partial_sync_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("partialSyncHeight", ToString::to_string(&self.partial_sync_height).as_str())?;
         }
         if self.catching_up {
@@ -4939,14 +4947,17 @@ impl serde::Serialize for StatusStreamResponse {
         let mut struct_ser = serializer.serialize_struct("penumbra.view.v1.StatusStreamResponse", len)?;
         if self.latest_known_block_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("latestKnownBlockHeight", ToString::to_string(&self.latest_known_block_height).as_str())?;
         }
         if self.full_sync_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("fullSyncHeight", ToString::to_string(&self.full_sync_height).as_str())?;
         }
         if self.partial_sync_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("partialSyncHeight", ToString::to_string(&self.partial_sync_height).as_str())?;
         }
         struct_ser.end()
@@ -5307,6 +5318,7 @@ impl serde::Serialize for SwapRecord {
         }
         if self.position != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("position", ToString::to_string(&self.position).as_str())?;
         }
         if let Some(v) = self.nullifier.as_ref() {
@@ -5317,6 +5329,7 @@ impl serde::Serialize for SwapRecord {
         }
         if self.height_claimed != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("heightClaimed", ToString::to_string(&self.height_claimed).as_str())?;
         }
         if let Some(v) = self.source.as_ref() {
@@ -5501,6 +5514,7 @@ impl serde::Serialize for TransactionInfo {
         let mut struct_ser = serializer.serialize_struct("penumbra.view.v1.TransactionInfo", len)?;
         if self.height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("height", ToString::to_string(&self.height).as_str())?;
         }
         if let Some(v) = self.id.as_ref() {
@@ -5849,10 +5863,12 @@ impl serde::Serialize for TransactionInfoRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.view.v1.TransactionInfoRequest", len)?;
         if self.start_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startHeight", ToString::to_string(&self.start_height).as_str())?;
         }
         if self.end_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("endHeight", ToString::to_string(&self.end_height).as_str())?;
         }
         struct_ser.end()
@@ -6125,6 +6141,7 @@ impl serde::Serialize for TransactionPlannerRequest {
         let mut struct_ser = serializer.serialize_struct("penumbra.view.v1.TransactionPlannerRequest", len)?;
         if self.expiry_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("expiryHeight", ToString::to_string(&self.expiry_height).as_str())?;
         }
         if let Some(v) = self.memo.as_ref() {
@@ -6183,6 +6200,7 @@ impl serde::Serialize for TransactionPlannerRequest {
         }
         if self.epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("epochIndex", ToString::to_string(&self.epoch_index).as_str())?;
         }
         if let Some(v) = self.epoch.as_ref() {
@@ -6750,6 +6768,7 @@ impl serde::Serialize for transaction_planner_request::ActionDutchAuctionWithdra
         }
         if self.seq != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("seq", ToString::to_string(&self.seq).as_str())?;
         }
         struct_ser.end()
@@ -6985,6 +7004,7 @@ impl serde::Serialize for transaction_planner_request::DelegatorVote {
         let mut struct_ser = serializer.serialize_struct("penumbra.view.v1.TransactionPlannerRequest.DelegatorVote", len)?;
         if self.proposal != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("proposal", ToString::to_string(&self.proposal).as_str())?;
         }
         if let Some(v) = self.vote.as_ref() {
@@ -6992,10 +7012,12 @@ impl serde::Serialize for transaction_planner_request::DelegatorVote {
         }
         if self.start_block_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startBlockHeight", ToString::to_string(&self.start_block_height).as_str())?;
         }
         if self.start_position != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startPosition", ToString::to_string(&self.start_position).as_str())?;
         }
         if !self.rate_data.is_empty() {
@@ -8066,6 +8088,7 @@ impl serde::Serialize for transaction_planner_request::UndelegateClaim {
         }
         if self.start_epoch_index != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("startEpochIndex", ToString::to_string(&self.start_epoch_index).as_str())?;
         }
         if let Some(v) = self.penalty.as_ref() {
@@ -8076,6 +8099,7 @@ impl serde::Serialize for transaction_planner_request::UndelegateClaim {
         }
         if self.unbonding_start_height != 0 {
             #[allow(clippy::needless_borrow)]
+            #[allow(clippy::needless_borrows_for_generic_args)]
             struct_ser.serialize_field("unbondingStartHeight", ToString::to_string(&self.unbonding_start_height).as_str())?;
         }
         struct_ser.end()
diff --git a/crates/proto/src/gen/proto_descriptor.bin.no_lfs b/crates/proto/src/gen/proto_descriptor.bin.no_lfs
index 895f0f725959cf9de6b287980a762aa4d11be6ff..9bf7426e3a803c4b30f2451b722a70dd6486ecdd 100644
GIT binary patch
delta 53
zcmZ2_S^e@d^@bM47N!>F7M3lnovQ5ug{(l#2E^<@%&}ddkdswvd#5U^sp)pnZq5mD
E0Poxo{Qv*}

delta 5555
zcmcIoOK;rP6&`Xpud6pD*)rugH<BgWi8PiUvSkNNtlCbZBz{D(9k{j=QJOm*)+2IE
zaz+xmpivktf&f8~F0?PuE(;VW;2+R#iz3LXe;`2jEdmr>^gH)n&Ws`{Rnc@IU_SEP
z^Zd@ahx+=rCw}wwiD%D^=jQY5bL$VePp4jd{$^=@e(^6eY^ovr=K5;ro?i34iW_>(
z_0z309Z+tBK^)klsaUx!R&JefwiCZ}GMV^=!H(Vx{Cgtws-C-A7w?I!dv3icmc`Si
zh+=z*WuJ(xF@qZ?d(K`g@2RZ(eHzNpxJ){nahAnzdxYgY-xnctZh!7)dy+2<_R>BY
zqDJ6H!oJONEpke`arwV<Ln$e%u#_U_C6<#I-XvYRdzTfMxWoqF>yAtes!W*3L`eoj
zks!xGbu5c##bpI1es8eB&RHG7)twQ{c13VGtscrk$<jvm@Y=qV8YCxr&Q5OsW23}<
zc%W@}hqYH!Gt9mnimJD{Bd|j(-;htoRBRee{D=+jkX9aTfAy!*@b+haF7$2tZ<mV6
z#0}Q_ksGhoQpSw4(i5@uNhltRO<AzgauE-f3EQ0Y`mIko@0CU7w-C6LnE0#7`m{cs
zyD?U1i7@g4U#hc~Q)s`*%;ZUHEGM(kozw1=?oifF@H?4h^GVBoi{;3l)>vNZINep3
z{dL?VZ)FPK$=J&loNqbrvts&iXNF2A;D1HbMJy_sC@FMqGS<<xJ@i@b)XKiXKQ6GG
z@Z)gn?C-Ly_k*Sgw>}hM%UcungN|)`dY=f|&MkhE8&0}MK|3YOLMQy^1{>Y8A?<Vf
zXx~#>6T&&a>rm2MC$jHzN_$adJzey(Pwmp8lyu3Y24DS8qH?||GjoQ0hvg(k?8$x3
zb<^89{{2F!)^|VUEN@$xOtd}pPirJO#!Af0X6&q$Il~w;^BLR9XGRVD&gL_Qoy`|V
z*apKh6GA2Pb?2x2ZGkcA)@K{dun|OpKM`BAEt-QoirrXnOz3cnFWz37;c?B4`I_tV
zRl%E)sPH&YuNim4RWD9L7ot!QanFae;P2kJ12sYDJ{D!hdRdMv!;ezFKSd_cz_Ao%
zflggwAO|@K$v$({X&%tY<Un5Ta?%g{S@gcXn|AqYkQe!J?V$mG`;IQ82>$k6U186q
zzln*LL*{$V#x94|>_f`_hxAIvwW2*UoTMqH#0}+#w3E^+`*@1-cz1d}MF?Q%!V<eL
z^9?X!UUJ^&A2wH`wa{A?5!Kj5PD0_X^Pt-0f3r~mKcX4F;l(vhlQ`MrRj(c+mHuNM
z_>u|jvS;DbNWMqg%_37Hy<;hYPa~73QbcaNdXZI`X@S5;GA|p>Pxx&SR)cUof;XKU
zDssAyUC)nVo)G0w&E3VEVIVAd<?_|7Sj-B4EvTq!z(I6}MXWqhq$F8Z1}$Vc*3ld}
zL<sMk-T~If@`R{&#*1UDpA{6$5$<FCN%{ct<Nd=O0R%LD=rHRc-E{hxHK<gZ8AN`}
zDx?Spj}>K(ND#-4^$$=ZTZV1Dk~tw8*&;%|Qk;^m8szGPc^uQ4<yI{~yqsXlS0J)B
zX^lu%B!sV%R;hy_J_&J(MZSm4Nqd;xfU5=_o;Gdg3crKI%AxQp{;xwx)DUav7L~sl
z?p3)L^9?uR)u8EDRK@8uVw*NqY(TIyjVw`0fnaBPaESd3v6;3tlR0BJ!9i+_5+^iP
zX1D<DM2LD4A9&FIRdb^neBiffYXV(D0WQ|Jc+_k(f)E#^KB5axy)sig%;piXNfDRL
zA?GAts`5z0H1p(0q&BDuEFioZCc*m7AwlPm*RolZ(E&kcxzw8?#9AI0WGAHsyqbfB
zalTO#G5}}}McfR1kW+4YvWub9fX+EHueDIs=L)1V$<a$For6*$N7lB^WnNe0pf)=P
zauScTM2_?31xXG<cz0fN1Bim1*W8d0_U1J=B!>9B=7z*DIS+1(5jnDSdSN#?9vp}q
zI1O?vXmS9-)Pg1l5DYDV98{7l)#tJ~hmtIAfAwu~IH6M0$QGMk6r+*#%|epUdD*1K
z$PuE0)32onIxm+`vuntgWm|7#77b^in{azfXgOVGh%T6aG(AWr@isMc(3IIXiVj<V
zn--<xiaFxECVNFG>yRdDuF7k%8t&o_P9pDDG<SfY^-5_#x(x)kuOR1C=A3O^&AgSU
zI_DsEwKy(kN{)<QGv&Ou0HE)h)&~T^YnqEd(02{Ap;45h)Lu7jX$k<xuIq{b(K}rc
zARN1niacT_E(+UP%G@)Y54Iaq=ApzF8(kB*;d)`DHieqo5?B?4&)0(WbuXsY1KFvg
z<Z7YQn1`h$>?ME49ctw%lw0Ou=Np4B%1Z@z3JNZ>r<aPI;~h(fTrT)6YVyw2psy#i
znciw5zD{2du<u1$^M+Ti(=wy_PhfQMn*nwnx#*CeV!aW!t1pk^Ms#tA{DJhHfG1*e
zt=_DN_Tw4ajbxPa>x54n|9AqIWX*%^RD~aCN<oQCKjKFEZ|SN5At|>?sx&}I|E<wO
z>|2#0yt`{U&fjE;68hxXm7_gxLD>4?vy>bxO+QeUh@^MhSt61qcT1x>g~ZakV@G6<
z7i{Z(CZZl+>>>rRQ&ktY!~wWjfPwqPQE0TR0!`Bgrkiyx@auK4j_;%h8&M)ly_1tf
zNiONH2Zy4IbQ5Zz^Z~QwIsrtCe`u*~K|+N1&|>mRmKfp>d-^*VQ9c}MA5W-@AL%hp
z@|2=SdW=g<@AVj$80Q~hr2N{zIztbzimh0q&X<P1^kkEUP0_ym^!I>F9$oYLLzDPl
z^Agz*!3G{<9%D*2y{M*EEiL!m{L3NOy~QcTvQO2Q2O3m%9tcZ|iF6WCtysklMpP@M
zLA7*A0fe<OJi@NaQej_OGrg>HvAa~VQhRoWDi*DVy0dkuh+u1MM3+h~L>0@{P5{EG
zq|(l{T5>9oR$i+$r-Hdjn`0qsP^m<_RDd`yx{i}M(JmF<BPP))l|iMdeWz65-+^oO
z|0osezq3~G5@FTawE{+1HL8`YB{0IOrKKYJ*UeEh>Yemr;OHj$PmHWrXQH?H*SSvI
zxU4>Utb!~?U5^GJ*sQ}Q?E*lsSck<~B1aK@9GGF&d0Cp2|L;&kfymuft|v3Zp(?;t
zNOxv|Vrig+N-s8!j{w!Chj;X{Pu<->Fxo)%)H#&ysdYr3GqI^Wwd6N2RFcl81F25R
g&eOwVzkD{8!(SeM1^g9XJew-@J1_nim%jM;->DfaF#rGn

diff --git a/crates/proto/src/gen/tendermint.abci.rs b/crates/proto/src/gen/tendermint.abci.rs
index 2cb2c6e801..f2035dd630 100644
--- a/crates/proto/src/gen/tendermint.abci.rs
+++ b/crates/proto/src/gen/tendermint.abci.rs
@@ -1,4 +1,4 @@
-#[allow(clippy::derive_partial_eq_without_eq)]
+// This file is @generated by prost-build.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Request {
     #[prost(
@@ -9,7 +9,6 @@ pub struct Request {
 }
 /// Nested message and enum types in `Request`.
 pub mod request {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Value {
         #[prost(message, tag = "1")]
@@ -50,10 +49,12 @@ impl ::prost::Name for Request {
     const NAME: &'static str = "Request";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.Request".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.Request".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestEcho {
     #[prost(string, tag = "1")]
@@ -63,20 +64,24 @@ impl ::prost::Name for RequestEcho {
     const NAME: &'static str = "RequestEcho";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestEcho".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestEcho".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct RequestFlush {}
 impl ::prost::Name for RequestFlush {
     const NAME: &'static str = "RequestFlush";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestFlush".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestFlush".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestInfo {
     #[prost(string, tag = "1")]
@@ -92,10 +97,12 @@ impl ::prost::Name for RequestInfo {
     const NAME: &'static str = "RequestInfo";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestInfo".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestInitChain {
     #[prost(message, optional, tag = "1")]
@@ -115,10 +122,12 @@ impl ::prost::Name for RequestInitChain {
     const NAME: &'static str = "RequestInitChain";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestInitChain".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestInitChain".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestQuery {
     #[prost(bytes = "vec", tag = "1")]
@@ -134,10 +143,12 @@ impl ::prost::Name for RequestQuery {
     const NAME: &'static str = "RequestQuery";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestQuery".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestQuery".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestBeginBlock {
     #[prost(bytes = "vec", tag = "1")]
@@ -153,10 +164,12 @@ impl ::prost::Name for RequestBeginBlock {
     const NAME: &'static str = "RequestBeginBlock";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestBeginBlock".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestBeginBlock".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestCheckTx {
     #[prost(bytes = "vec", tag = "1")]
@@ -168,10 +181,12 @@ impl ::prost::Name for RequestCheckTx {
     const NAME: &'static str = "RequestCheckTx";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestCheckTx".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestCheckTx".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestDeliverTx {
     #[prost(bytes = "vec", tag = "1")]
@@ -181,11 +196,13 @@ impl ::prost::Name for RequestDeliverTx {
     const NAME: &'static str = "RequestDeliverTx";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestDeliverTx".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestDeliverTx".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct RequestEndBlock {
     #[prost(int64, tag = "1")]
     pub height: i64,
@@ -194,32 +211,38 @@ impl ::prost::Name for RequestEndBlock {
     const NAME: &'static str = "RequestEndBlock";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestEndBlock".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestEndBlock".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct RequestCommit {}
 impl ::prost::Name for RequestCommit {
     const NAME: &'static str = "RequestCommit";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestCommit".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestCommit".into()
     }
 }
 /// lists available snapshots
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct RequestListSnapshots {}
 impl ::prost::Name for RequestListSnapshots {
     const NAME: &'static str = "RequestListSnapshots";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestListSnapshots".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestListSnapshots".into()
     }
 }
 /// offers a snapshot to the application
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestOfferSnapshot {
     /// snapshot offered by peers
@@ -233,12 +256,14 @@ impl ::prost::Name for RequestOfferSnapshot {
     const NAME: &'static str = "RequestOfferSnapshot";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestOfferSnapshot".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestOfferSnapshot".into()
     }
 }
 /// loads a snapshot chunk
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct RequestLoadSnapshotChunk {
     #[prost(uint64, tag = "1")]
     pub height: u64,
@@ -251,11 +276,13 @@ impl ::prost::Name for RequestLoadSnapshotChunk {
     const NAME: &'static str = "RequestLoadSnapshotChunk";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestLoadSnapshotChunk".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestLoadSnapshotChunk".into()
     }
 }
 /// Applies a snapshot chunk
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestApplySnapshotChunk {
     #[prost(uint32, tag = "1")]
@@ -269,10 +296,12 @@ impl ::prost::Name for RequestApplySnapshotChunk {
     const NAME: &'static str = "RequestApplySnapshotChunk";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestApplySnapshotChunk".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestApplySnapshotChunk".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestPrepareProposal {
     /// the modified transactions cannot exceed this size.
@@ -300,10 +329,12 @@ impl ::prost::Name for RequestPrepareProposal {
     const NAME: &'static str = "RequestPrepareProposal";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestPrepareProposal".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestPrepareProposal".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestProcessProposal {
     #[prost(bytes = "vec", repeated, tag = "1")]
@@ -329,10 +360,12 @@ impl ::prost::Name for RequestProcessProposal {
     const NAME: &'static str = "RequestProcessProposal";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.RequestProcessProposal".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.RequestProcessProposal".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Response {
     #[prost(
@@ -343,7 +376,6 @@ pub struct Response {
 }
 /// Nested message and enum types in `Response`.
 pub mod response {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Value {
         #[prost(message, tag = "1")]
@@ -386,11 +418,13 @@ impl ::prost::Name for Response {
     const NAME: &'static str = "Response";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.Response".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.Response".into()
     }
 }
 /// nondeterministic
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponseException {
     #[prost(string, tag = "1")]
@@ -400,10 +434,12 @@ impl ::prost::Name for ResponseException {
     const NAME: &'static str = "ResponseException";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseException".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseException".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponseEcho {
     #[prost(string, tag = "1")]
@@ -413,20 +449,24 @@ impl ::prost::Name for ResponseEcho {
     const NAME: &'static str = "ResponseEcho";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseEcho".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseEcho".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ResponseFlush {}
 impl ::prost::Name for ResponseFlush {
     const NAME: &'static str = "ResponseFlush";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseFlush".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseFlush".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponseInfo {
     #[prost(string, tag = "1")]
@@ -444,10 +484,12 @@ impl ::prost::Name for ResponseInfo {
     const NAME: &'static str = "ResponseInfo";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseInfo".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponseInitChain {
     #[prost(message, optional, tag = "1")]
@@ -461,10 +503,12 @@ impl ::prost::Name for ResponseInitChain {
     const NAME: &'static str = "ResponseInitChain";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseInitChain".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseInitChain".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponseQuery {
     #[prost(uint32, tag = "1")]
@@ -494,10 +538,12 @@ impl ::prost::Name for ResponseQuery {
     const NAME: &'static str = "ResponseQuery";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseQuery".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseQuery".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponseBeginBlock {
     #[prost(message, repeated, tag = "1")]
@@ -507,10 +553,12 @@ impl ::prost::Name for ResponseBeginBlock {
     const NAME: &'static str = "ResponseBeginBlock";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseBeginBlock".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseBeginBlock".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponseCheckTx {
     #[prost(uint32, tag = "1")]
@@ -544,10 +592,12 @@ impl ::prost::Name for ResponseCheckTx {
     const NAME: &'static str = "ResponseCheckTx";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseCheckTx".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseCheckTx".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponseDeliverTx {
     #[prost(uint32, tag = "1")]
@@ -574,10 +624,12 @@ impl ::prost::Name for ResponseDeliverTx {
     const NAME: &'static str = "ResponseDeliverTx";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseDeliverTx".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseDeliverTx".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponseEndBlock {
     #[prost(message, repeated, tag = "1")]
@@ -591,10 +643,12 @@ impl ::prost::Name for ResponseEndBlock {
     const NAME: &'static str = "ResponseEndBlock";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseEndBlock".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseEndBlock".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponseCommit {
     /// reserve 1
@@ -607,10 +661,12 @@ impl ::prost::Name for ResponseCommit {
     const NAME: &'static str = "ResponseCommit";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseCommit".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseCommit".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponseListSnapshots {
     #[prost(message, repeated, tag = "1")]
@@ -620,11 +676,13 @@ impl ::prost::Name for ResponseListSnapshots {
     const NAME: &'static str = "ResponseListSnapshots";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseListSnapshots".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseListSnapshots".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ResponseOfferSnapshot {
     #[prost(enumeration = "response_offer_snapshot::Result", tag = "1")]
     pub result: i32,
@@ -664,12 +722,12 @@ pub mod response_offer_snapshot {
         /// (if the ProtoBuf definition does not change) and safe for programmatic use.
         pub fn as_str_name(&self) -> &'static str {
             match self {
-                Result::Unknown => "UNKNOWN",
-                Result::Accept => "ACCEPT",
-                Result::Abort => "ABORT",
-                Result::Reject => "REJECT",
-                Result::RejectFormat => "REJECT_FORMAT",
-                Result::RejectSender => "REJECT_SENDER",
+                Self::Unknown => "UNKNOWN",
+                Self::Accept => "ACCEPT",
+                Self::Abort => "ABORT",
+                Self::Reject => "REJECT",
+                Self::RejectFormat => "REJECT_FORMAT",
+                Self::RejectSender => "REJECT_SENDER",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.
@@ -690,10 +748,12 @@ impl ::prost::Name for ResponseOfferSnapshot {
     const NAME: &'static str = "ResponseOfferSnapshot";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseOfferSnapshot".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseOfferSnapshot".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponseLoadSnapshotChunk {
     #[prost(bytes = "vec", tag = "1")]
@@ -703,10 +763,12 @@ impl ::prost::Name for ResponseLoadSnapshotChunk {
     const NAME: &'static str = "ResponseLoadSnapshotChunk";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseLoadSnapshotChunk".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseLoadSnapshotChunk".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponseApplySnapshotChunk {
     #[prost(enumeration = "response_apply_snapshot_chunk::Result", tag = "1")]
@@ -753,12 +815,12 @@ pub mod response_apply_snapshot_chunk {
         /// (if the ProtoBuf definition does not change) and safe for programmatic use.
         pub fn as_str_name(&self) -> &'static str {
             match self {
-                Result::Unknown => "UNKNOWN",
-                Result::Accept => "ACCEPT",
-                Result::Abort => "ABORT",
-                Result::Retry => "RETRY",
-                Result::RetrySnapshot => "RETRY_SNAPSHOT",
-                Result::RejectSnapshot => "REJECT_SNAPSHOT",
+                Self::Unknown => "UNKNOWN",
+                Self::Accept => "ACCEPT",
+                Self::Abort => "ABORT",
+                Self::Retry => "RETRY",
+                Self::RetrySnapshot => "RETRY_SNAPSHOT",
+                Self::RejectSnapshot => "REJECT_SNAPSHOT",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.
@@ -779,10 +841,12 @@ impl ::prost::Name for ResponseApplySnapshotChunk {
     const NAME: &'static str = "ResponseApplySnapshotChunk";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseApplySnapshotChunk".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseApplySnapshotChunk".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResponsePrepareProposal {
     #[prost(bytes = "vec", repeated, tag = "1")]
@@ -792,11 +856,13 @@ impl ::prost::Name for ResponsePrepareProposal {
     const NAME: &'static str = "ResponsePrepareProposal";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponsePrepareProposal".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponsePrepareProposal".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ResponseProcessProposal {
     #[prost(enumeration = "response_process_proposal::ProposalStatus", tag = "1")]
     pub status: i32,
@@ -827,9 +893,9 @@ pub mod response_process_proposal {
         /// (if the ProtoBuf definition does not change) and safe for programmatic use.
         pub fn as_str_name(&self) -> &'static str {
             match self {
-                ProposalStatus::Unknown => "UNKNOWN",
-                ProposalStatus::Accept => "ACCEPT",
-                ProposalStatus::Reject => "REJECT",
+                Self::Unknown => "UNKNOWN",
+                Self::Accept => "ACCEPT",
+                Self::Reject => "REJECT",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.
@@ -847,10 +913,12 @@ impl ::prost::Name for ResponseProcessProposal {
     const NAME: &'static str = "ResponseProcessProposal";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ResponseProcessProposal".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ResponseProcessProposal".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CommitInfo {
     #[prost(int32, tag = "1")]
@@ -862,10 +930,12 @@ impl ::prost::Name for CommitInfo {
     const NAME: &'static str = "CommitInfo";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.CommitInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.CommitInfo".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ExtendedCommitInfo {
     /// The round at which the block proposer decided in the previous height.
@@ -880,13 +950,15 @@ impl ::prost::Name for ExtendedCommitInfo {
     const NAME: &'static str = "ExtendedCommitInfo";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ExtendedCommitInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ExtendedCommitInfo".into()
     }
 }
 /// Event allows application developers to attach additional information to
 /// ResponseBeginBlock, ResponseEndBlock, ResponseCheckTx and ResponseDeliverTx.
 /// Later, transactions may be queried using these events.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Event {
     #[prost(string, tag = "1")]
@@ -898,11 +970,13 @@ impl ::prost::Name for Event {
     const NAME: &'static str = "Event";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.Event".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.Event".into()
     }
 }
 /// EventAttribute is a single key-value pair, associated with an event.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EventAttribute {
     #[prost(string, tag = "1")]
@@ -917,13 +991,15 @@ impl ::prost::Name for EventAttribute {
     const NAME: &'static str = "EventAttribute";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.EventAttribute".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.EventAttribute".into()
     }
 }
 /// TxResult contains results of executing the transaction.
 ///
 /// One usage is indexing transaction results.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxResult {
     #[prost(int64, tag = "1")]
@@ -939,11 +1015,13 @@ impl ::prost::Name for TxResult {
     const NAME: &'static str = "TxResult";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.TxResult".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.TxResult".into()
     }
 }
 /// Validator
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Validator {
     /// The first 20 bytes of SHA256(public key)
@@ -959,11 +1037,13 @@ impl ::prost::Name for Validator {
     const NAME: &'static str = "Validator";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.Validator".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.Validator".into()
     }
 }
 /// ValidatorUpdate
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorUpdate {
     #[prost(message, optional, tag = "1")]
@@ -975,11 +1055,13 @@ impl ::prost::Name for ValidatorUpdate {
     const NAME: &'static str = "ValidatorUpdate";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ValidatorUpdate".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ValidatorUpdate".into()
     }
 }
 /// VoteInfo
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct VoteInfo {
     #[prost(message, optional, tag = "1")]
@@ -991,10 +1073,12 @@ impl ::prost::Name for VoteInfo {
     const NAME: &'static str = "VoteInfo";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.VoteInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.VoteInfo".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ExtendedVoteInfo {
     #[prost(message, optional, tag = "1")]
@@ -1009,10 +1093,12 @@ impl ::prost::Name for ExtendedVoteInfo {
     const NAME: &'static str = "ExtendedVoteInfo";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.ExtendedVoteInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.ExtendedVoteInfo".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Misbehavior {
     #[prost(enumeration = "MisbehaviorType", tag = "1")]
@@ -1036,10 +1122,12 @@ impl ::prost::Name for Misbehavior {
     const NAME: &'static str = "Misbehavior";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.Misbehavior".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.Misbehavior".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Snapshot {
     /// The height at which the snapshot was taken
@@ -1062,7 +1150,10 @@ impl ::prost::Name for Snapshot {
     const NAME: &'static str = "Snapshot";
     const PACKAGE: &'static str = "tendermint.abci";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.abci.{}", Self::NAME)
+        "tendermint.abci.Snapshot".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.abci.Snapshot".into()
     }
 }
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
@@ -1078,8 +1169,8 @@ impl CheckTxType {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            CheckTxType::New => "NEW",
-            CheckTxType::Recheck => "RECHECK",
+            Self::New => "NEW",
+            Self::Recheck => "RECHECK",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -1105,9 +1196,9 @@ impl MisbehaviorType {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            MisbehaviorType::Unknown => "UNKNOWN",
-            MisbehaviorType::DuplicateVote => "DUPLICATE_VOTE",
-            MisbehaviorType::LightClientAttack => "LIGHT_CLIENT_ATTACK",
+            Self::Unknown => "UNKNOWN",
+            Self::DuplicateVote => "DUPLICATE_VOTE",
+            Self::LightClientAttack => "LIGHT_CLIENT_ATTACK",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -1123,7 +1214,13 @@ impl MisbehaviorType {
 /// Generated client implementations.
 #[cfg(feature = "rpc")]
 pub mod abci_application_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
     #[derive(Debug, Clone)]
@@ -1145,8 +1242,8 @@ pub mod abci_application_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -1171,7 +1268,7 @@ pub mod abci_application_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             AbciApplicationClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -1214,8 +1311,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1236,8 +1332,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1258,8 +1353,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1283,8 +1377,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1308,8 +1401,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1330,8 +1422,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1352,8 +1443,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1377,8 +1467,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1402,8 +1491,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1429,8 +1517,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1454,8 +1541,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1481,8 +1567,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1508,8 +1593,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1538,8 +1622,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1568,8 +1651,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1595,8 +1677,7 @@ pub mod abci_application_client {
                 .ready()
                 .await
                 .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
+                    tonic::Status::unknown(
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
@@ -1616,11 +1697,17 @@ pub mod abci_application_client {
 /// Generated server implementations.
 #[cfg(feature = "rpc")]
 pub mod abci_application_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with AbciApplicationServer.
     #[async_trait]
-    pub trait AbciApplication: Send + Sync + 'static {
+    pub trait AbciApplication: std::marker::Send + std::marker::Sync + 'static {
         async fn echo(
             &self,
             request: tonic::Request<super::RequestEcho>,
@@ -1717,20 +1804,18 @@ pub mod abci_application_server {
         >;
     }
     #[derive(Debug)]
-    pub struct AbciApplicationServer<T: AbciApplication> {
-        inner: _Inner<T>,
+    pub struct AbciApplicationServer<T> {
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
-    impl<T: AbciApplication> AbciApplicationServer<T> {
+    impl<T> AbciApplicationServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -1780,8 +1865,8 @@ pub mod abci_application_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for AbciApplicationServer<T>
     where
         T: AbciApplication,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -1793,7 +1878,6 @@ pub mod abci_application_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/tendermint.abci.ABCIApplication/Echo" => {
                     #[allow(non_camel_case_types)]
@@ -1823,7 +1907,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = EchoSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1868,7 +1951,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = FlushSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1913,7 +1995,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = InfoSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -1959,7 +2040,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = DeliverTxSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2005,7 +2085,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = CheckTxSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2050,7 +2129,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = QuerySvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2096,7 +2174,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = CommitSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2142,7 +2219,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = InitChainSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2188,7 +2264,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = BeginBlockSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2234,7 +2309,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = EndBlockSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2281,7 +2355,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ListSnapshotsSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2328,7 +2401,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = OfferSnapshotSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2375,7 +2447,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = LoadSnapshotChunkSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2425,7 +2496,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ApplySnapshotChunkSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2472,7 +2542,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = PrepareProposalSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2519,7 +2588,6 @@ pub mod abci_application_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let inner = inner.0;
                         let method = ProcessProposalSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -2538,20 +2606,25 @@ pub mod abci_application_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
                     })
                 }
             }
         }
     }
-    impl<T: AbciApplication> Clone for AbciApplicationServer<T> {
+    impl<T> Clone for AbciApplicationServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -2563,17 +2636,9 @@ pub mod abci_application_server {
             }
         }
     }
-    impl<T: AbciApplication> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: AbciApplication> tonic::server::NamedService for AbciApplicationServer<T> {
-        const NAME: &'static str = "tendermint.abci.ABCIApplication";
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "tendermint.abci.ABCIApplication";
+    impl<T> tonic::server::NamedService for AbciApplicationServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
     }
 }
diff --git a/crates/proto/src/gen/tendermint.crypto.rs b/crates/proto/src/gen/tendermint.crypto.rs
index d0c624cc9b..916eaf75f5 100644
--- a/crates/proto/src/gen/tendermint.crypto.rs
+++ b/crates/proto/src/gen/tendermint.crypto.rs
@@ -1,4 +1,4 @@
-#[allow(clippy::derive_partial_eq_without_eq)]
+// This file is @generated by prost-build.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Proof {
     #[prost(int64, tag = "1")]
@@ -14,10 +14,12 @@ impl ::prost::Name for Proof {
     const NAME: &'static str = "Proof";
     const PACKAGE: &'static str = "tendermint.crypto";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.crypto.{}", Self::NAME)
+        "tendermint.crypto.Proof".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.crypto.Proof".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValueOp {
     /// Encoded in ProofOp.Key.
@@ -31,10 +33,12 @@ impl ::prost::Name for ValueOp {
     const NAME: &'static str = "ValueOp";
     const PACKAGE: &'static str = "tendermint.crypto";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.crypto.{}", Self::NAME)
+        "tendermint.crypto.ValueOp".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.crypto.ValueOp".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DominoOp {
     #[prost(string, tag = "1")]
@@ -48,13 +52,15 @@ impl ::prost::Name for DominoOp {
     const NAME: &'static str = "DominoOp";
     const PACKAGE: &'static str = "tendermint.crypto";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.crypto.{}", Self::NAME)
+        "tendermint.crypto.DominoOp".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.crypto.DominoOp".into()
     }
 }
 /// ProofOp defines an operation used for calculating Merkle root
 /// The data could be arbitrary format, providing nessecary data
 /// for example neighbouring node hash
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProofOp {
     #[prost(string, tag = "1")]
@@ -68,11 +74,13 @@ impl ::prost::Name for ProofOp {
     const NAME: &'static str = "ProofOp";
     const PACKAGE: &'static str = "tendermint.crypto";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.crypto.{}", Self::NAME)
+        "tendermint.crypto.ProofOp".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.crypto.ProofOp".into()
     }
 }
 /// ProofOps is Merkle proof defined by the list of ProofOps
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProofOps {
     #[prost(message, repeated, tag = "1")]
@@ -82,11 +90,13 @@ impl ::prost::Name for ProofOps {
     const NAME: &'static str = "ProofOps";
     const PACKAGE: &'static str = "tendermint.crypto";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.crypto.{}", Self::NAME)
+        "tendermint.crypto.ProofOps".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.crypto.ProofOps".into()
     }
 }
 /// PublicKey defines the keys available for use with Validators
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PublicKey {
     #[prost(oneof = "public_key::Sum", tags = "1, 2")]
@@ -94,7 +104,6 @@ pub struct PublicKey {
 }
 /// Nested message and enum types in `PublicKey`.
 pub mod public_key {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Sum {
         #[prost(bytes, tag = "1")]
@@ -107,6 +116,9 @@ impl ::prost::Name for PublicKey {
     const NAME: &'static str = "PublicKey";
     const PACKAGE: &'static str = "tendermint.crypto";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.crypto.{}", Self::NAME)
+        "tendermint.crypto.PublicKey".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.crypto.PublicKey".into()
     }
 }
diff --git a/crates/proto/src/gen/tendermint.p2p.rs b/crates/proto/src/gen/tendermint.p2p.rs
index 61828675bb..f948e62121 100644
--- a/crates/proto/src/gen/tendermint.p2p.rs
+++ b/crates/proto/src/gen/tendermint.p2p.rs
@@ -1,4 +1,4 @@
-#[allow(clippy::derive_partial_eq_without_eq)]
+// This file is @generated by prost-build.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NetAddress {
     #[prost(string, tag = "1")]
@@ -12,11 +12,13 @@ impl ::prost::Name for NetAddress {
     const NAME: &'static str = "NetAddress";
     const PACKAGE: &'static str = "tendermint.p2p";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.p2p.{}", Self::NAME)
+        "tendermint.p2p.NetAddress".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.p2p.NetAddress".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ProtocolVersion {
     #[prost(uint64, tag = "1")]
     pub p2p: u64,
@@ -29,10 +31,12 @@ impl ::prost::Name for ProtocolVersion {
     const NAME: &'static str = "ProtocolVersion";
     const PACKAGE: &'static str = "tendermint.p2p";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.p2p.{}", Self::NAME)
+        "tendermint.p2p.ProtocolVersion".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.p2p.ProtocolVersion".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DefaultNodeInfo {
     #[prost(message, optional, tag = "1")]
@@ -56,10 +60,12 @@ impl ::prost::Name for DefaultNodeInfo {
     const NAME: &'static str = "DefaultNodeInfo";
     const PACKAGE: &'static str = "tendermint.p2p";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.p2p.{}", Self::NAME)
+        "tendermint.p2p.DefaultNodeInfo".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.p2p.DefaultNodeInfo".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DefaultNodeInfoOther {
     #[prost(string, tag = "1")]
@@ -71,6 +77,9 @@ impl ::prost::Name for DefaultNodeInfoOther {
     const NAME: &'static str = "DefaultNodeInfoOther";
     const PACKAGE: &'static str = "tendermint.p2p";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.p2p.{}", Self::NAME)
+        "tendermint.p2p.DefaultNodeInfoOther".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.p2p.DefaultNodeInfoOther".into()
     }
 }
diff --git a/crates/proto/src/gen/tendermint.types.rs b/crates/proto/src/gen/tendermint.types.rs
index dd05ee65c4..0b2130371a 100644
--- a/crates/proto/src/gen/tendermint.types.rs
+++ b/crates/proto/src/gen/tendermint.types.rs
@@ -1,4 +1,4 @@
-#[allow(clippy::derive_partial_eq_without_eq)]
+// This file is @generated by prost-build.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorSet {
     #[prost(message, repeated, tag = "1")]
@@ -12,10 +12,12 @@ impl ::prost::Name for ValidatorSet {
     const NAME: &'static str = "ValidatorSet";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.ValidatorSet".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.ValidatorSet".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Validator {
     #[prost(bytes = "vec", tag = "1")]
@@ -31,10 +33,12 @@ impl ::prost::Name for Validator {
     const NAME: &'static str = "Validator";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.Validator".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.Validator".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SimpleValidator {
     #[prost(message, optional, tag = "1")]
@@ -46,11 +50,13 @@ impl ::prost::Name for SimpleValidator {
     const NAME: &'static str = "SimpleValidator";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.SimpleValidator".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.SimpleValidator".into()
     }
 }
 /// PartsetHeader
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PartSetHeader {
     #[prost(uint32, tag = "1")]
@@ -62,10 +68,12 @@ impl ::prost::Name for PartSetHeader {
     const NAME: &'static str = "PartSetHeader";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.PartSetHeader".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.PartSetHeader".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Part {
     #[prost(uint32, tag = "1")]
@@ -79,11 +87,13 @@ impl ::prost::Name for Part {
     const NAME: &'static str = "Part";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.Part".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.Part".into()
     }
 }
 /// BlockID
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BlockId {
     #[prost(bytes = "vec", tag = "1")]
@@ -95,11 +105,13 @@ impl ::prost::Name for BlockId {
     const NAME: &'static str = "BlockID";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.BlockID".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.BlockID".into()
     }
 }
 /// Header defines the structure of a block header.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Header {
     /// basic block info
@@ -152,11 +164,13 @@ impl ::prost::Name for Header {
     const NAME: &'static str = "Header";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.Header".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.Header".into()
     }
 }
 /// Data contains the set of transactions included in the block
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Data {
     /// Txs that will be applied by state @ block.Height+1.
@@ -169,12 +183,14 @@ impl ::prost::Name for Data {
     const NAME: &'static str = "Data";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.Data".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.Data".into()
     }
 }
 /// Vote represents a prevote, precommit, or commit vote from validators for
 /// consensus.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Vote {
     #[prost(enumeration = "SignedMsgType", tag = "1")]
@@ -199,11 +215,13 @@ impl ::prost::Name for Vote {
     const NAME: &'static str = "Vote";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.Vote".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.Vote".into()
     }
 }
 /// Commit contains the evidence that a block was committed by a set of validators.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Commit {
     #[prost(int64, tag = "1")]
@@ -219,11 +237,13 @@ impl ::prost::Name for Commit {
     const NAME: &'static str = "Commit";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.Commit".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.Commit".into()
     }
 }
 /// CommitSig is a part of the Vote included in a Commit.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CommitSig {
     #[prost(enumeration = "BlockIdFlag", tag = "1")]
@@ -239,10 +259,12 @@ impl ::prost::Name for CommitSig {
     const NAME: &'static str = "CommitSig";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.CommitSig".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.CommitSig".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Proposal {
     #[prost(enumeration = "SignedMsgType", tag = "1")]
@@ -264,10 +286,12 @@ impl ::prost::Name for Proposal {
     const NAME: &'static str = "Proposal";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.Proposal".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.Proposal".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SignedHeader {
     #[prost(message, optional, tag = "1")]
@@ -279,10 +303,12 @@ impl ::prost::Name for SignedHeader {
     const NAME: &'static str = "SignedHeader";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.SignedHeader".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.SignedHeader".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct LightBlock {
     #[prost(message, optional, tag = "1")]
@@ -294,10 +320,12 @@ impl ::prost::Name for LightBlock {
     const NAME: &'static str = "LightBlock";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.LightBlock".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.LightBlock".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BlockMeta {
     #[prost(message, optional, tag = "1")]
@@ -313,11 +341,13 @@ impl ::prost::Name for BlockMeta {
     const NAME: &'static str = "BlockMeta";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.BlockMeta".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.BlockMeta".into()
     }
 }
 /// TxProof represents a Merkle proof of the presence of a transaction in the Merkle tree.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TxProof {
     #[prost(bytes = "vec", tag = "1")]
@@ -331,7 +361,10 @@ impl ::prost::Name for TxProof {
     const NAME: &'static str = "TxProof";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.TxProof".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.TxProof".into()
     }
 }
 /// BlockIdFlag indicates which BlcokID the signature is for
@@ -350,10 +383,10 @@ impl BlockIdFlag {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            BlockIdFlag::Unknown => "BLOCK_ID_FLAG_UNKNOWN",
-            BlockIdFlag::Absent => "BLOCK_ID_FLAG_ABSENT",
-            BlockIdFlag::Commit => "BLOCK_ID_FLAG_COMMIT",
-            BlockIdFlag::Nil => "BLOCK_ID_FLAG_NIL",
+            Self::Unknown => "BLOCK_ID_FLAG_UNKNOWN",
+            Self::Absent => "BLOCK_ID_FLAG_ABSENT",
+            Self::Commit => "BLOCK_ID_FLAG_COMMIT",
+            Self::Nil => "BLOCK_ID_FLAG_NIL",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -385,10 +418,10 @@ impl SignedMsgType {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            SignedMsgType::Unknown => "SIGNED_MSG_TYPE_UNKNOWN",
-            SignedMsgType::Prevote => "SIGNED_MSG_TYPE_PREVOTE",
-            SignedMsgType::Precommit => "SIGNED_MSG_TYPE_PRECOMMIT",
-            SignedMsgType::Proposal => "SIGNED_MSG_TYPE_PROPOSAL",
+            Self::Unknown => "SIGNED_MSG_TYPE_UNKNOWN",
+            Self::Prevote => "SIGNED_MSG_TYPE_PREVOTE",
+            Self::Precommit => "SIGNED_MSG_TYPE_PRECOMMIT",
+            Self::Proposal => "SIGNED_MSG_TYPE_PROPOSAL",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -402,7 +435,6 @@ impl SignedMsgType {
         }
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Evidence {
     #[prost(oneof = "evidence::Sum", tags = "1, 2")]
@@ -410,7 +442,6 @@ pub struct Evidence {
 }
 /// Nested message and enum types in `Evidence`.
 pub mod evidence {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Sum {
         #[prost(message, tag = "1")]
@@ -423,11 +454,13 @@ impl ::prost::Name for Evidence {
     const NAME: &'static str = "Evidence";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.Evidence".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.Evidence".into()
     }
 }
 /// DuplicateVoteEvidence contains evidence of a validator signed two conflicting votes.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DuplicateVoteEvidence {
     #[prost(message, optional, tag = "1")]
@@ -445,11 +478,13 @@ impl ::prost::Name for DuplicateVoteEvidence {
     const NAME: &'static str = "DuplicateVoteEvidence";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.DuplicateVoteEvidence".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.DuplicateVoteEvidence".into()
     }
 }
 /// LightClientAttackEvidence contains evidence of a set of validators attempting to mislead a light client.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct LightClientAttackEvidence {
     #[prost(message, optional, tag = "1")]
@@ -467,10 +502,12 @@ impl ::prost::Name for LightClientAttackEvidence {
     const NAME: &'static str = "LightClientAttackEvidence";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.LightClientAttackEvidence".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.LightClientAttackEvidence".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EvidenceList {
     #[prost(message, repeated, tag = "1")]
@@ -480,10 +517,12 @@ impl ::prost::Name for EvidenceList {
     const NAME: &'static str = "EvidenceList";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.EvidenceList".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.EvidenceList".into()
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Block {
     #[prost(message, optional, tag = "1")]
@@ -499,12 +538,14 @@ impl ::prost::Name for Block {
     const NAME: &'static str = "Block";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.Block".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.Block".into()
     }
 }
 /// ConsensusParams contains consensus critical parameters that determine the
 /// validity of blocks.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ConsensusParams {
     #[prost(message, optional, tag = "1")]
@@ -520,12 +561,14 @@ impl ::prost::Name for ConsensusParams {
     const NAME: &'static str = "ConsensusParams";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.ConsensusParams".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.ConsensusParams".into()
     }
 }
 /// BlockParams contains limits on the block size.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct BlockParams {
     /// Max block size, in bytes.
     /// Note: must be greater than 0
@@ -540,12 +583,14 @@ impl ::prost::Name for BlockParams {
     const NAME: &'static str = "BlockParams";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.BlockParams".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.BlockParams".into()
     }
 }
 /// EvidenceParams determine how we handle evidence of malfeasance.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct EvidenceParams {
     /// Max age of evidence, in blocks.
     ///
@@ -570,12 +615,14 @@ impl ::prost::Name for EvidenceParams {
     const NAME: &'static str = "EvidenceParams";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.EvidenceParams".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.EvidenceParams".into()
     }
 }
 /// ValidatorParams restrict the public key types validators can use.
 /// NOTE: uses ABCI pubkey naming, not Amino names.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValidatorParams {
     #[prost(string, repeated, tag = "1")]
@@ -585,12 +632,14 @@ impl ::prost::Name for ValidatorParams {
     const NAME: &'static str = "ValidatorParams";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.ValidatorParams".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.ValidatorParams".into()
     }
 }
 /// VersionParams contains the ABCI application version.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct VersionParams {
     #[prost(uint64, tag = "1")]
     pub app: u64,
@@ -599,14 +648,16 @@ impl ::prost::Name for VersionParams {
     const NAME: &'static str = "VersionParams";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.VersionParams".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.VersionParams".into()
     }
 }
 /// HashedParams is a subset of ConsensusParams.
 ///
 /// It is hashed into the Header.ConsensusHash.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct HashedParams {
     #[prost(int64, tag = "1")]
     pub block_max_bytes: i64,
@@ -617,6 +668,9 @@ impl ::prost::Name for HashedParams {
     const NAME: &'static str = "HashedParams";
     const PACKAGE: &'static str = "tendermint.types";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.types.{}", Self::NAME)
+        "tendermint.types.HashedParams".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.types.HashedParams".into()
     }
 }
diff --git a/crates/proto/src/gen/tendermint.version.rs b/crates/proto/src/gen/tendermint.version.rs
index e2028c7901..ef045e12cb 100644
--- a/crates/proto/src/gen/tendermint.version.rs
+++ b/crates/proto/src/gen/tendermint.version.rs
@@ -1,7 +1,7 @@
+// This file is @generated by prost-build.
 /// App includes the protocol and software version for the application.
 /// This information is included in ResponseInfo. The App.Protocol can be
 /// updated in ResponseEndBlock.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct App {
     #[prost(uint64, tag = "1")]
@@ -13,14 +13,16 @@ impl ::prost::Name for App {
     const NAME: &'static str = "App";
     const PACKAGE: &'static str = "tendermint.version";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.version.{}", Self::NAME)
+        "tendermint.version.App".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.version.App".into()
     }
 }
 /// Consensus captures the consensus rules for processing a block in the blockchain,
 /// including all blockchain data structures and the rules of the application's
 /// state transition machine.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct Consensus {
     #[prost(uint64, tag = "1")]
     pub block: u64,
@@ -31,6 +33,9 @@ impl ::prost::Name for Consensus {
     const NAME: &'static str = "Consensus";
     const PACKAGE: &'static str = "tendermint.version";
     fn full_name() -> ::prost::alloc::string::String {
-        ::prost::alloc::format!("tendermint.version.{}", Self::NAME)
+        "tendermint.version.Consensus".into()
+    }
+    fn type_url() -> ::prost::alloc::string::String {
+        "/tendermint.version.Consensus".into()
     }
 }
diff --git a/crates/proto/src/lib.rs b/crates/proto/src/lib.rs
index d48882a2c2..24efda9fd4 100644
--- a/crates/proto/src/lib.rs
+++ b/crates/proto/src/lib.rs
@@ -225,13 +225,6 @@ pub mod penumbra {
         }
     }
 
-    pub mod cnidarium {
-        pub mod v1 {
-            include!("gen/penumbra.cnidarium.v1.rs");
-            include!("gen/penumbra.cnidarium.v1.serde.rs");
-        }
-    }
-
     pub mod util {
         pub mod tendermint_proxy {
             pub mod v1 {
diff --git a/crates/proto/src/protobuf/tendermint_compat.rs b/crates/proto/src/protobuf/tendermint_compat.rs
index 661b3012ef..47111a3fff 100644
--- a/crates/proto/src/protobuf/tendermint_compat.rs
+++ b/crates/proto/src/protobuf/tendermint_compat.rs
@@ -60,16 +60,10 @@ impl From<tendermint::abci::types::ExecTxResult> for penumbra_pb::TxResult {
 }
 
 impl From<tendermint::abci::EventAttribute> for penumbra_pb::Tag {
-    fn from(
-        tendermint::abci::EventAttribute {
-            key,
-            value,
-            index: _,
-        }: tendermint::abci::EventAttribute,
-    ) -> Self {
+    fn from(event_attr: tendermint::abci::EventAttribute) -> Self {
         Self {
-            key: key.into_bytes(),
-            value: value.into_bytes(),
+            key: event_attr.key_bytes().into(),
+            value: event_attr.value_bytes().into(),
             // TODO(kate): this was set to false previously, but it should probably use the
             // index field from the tendermint object. for now, carry out a refactor and avoid
             // changing behavior while doing so.
@@ -78,6 +72,25 @@ impl From<tendermint::abci::EventAttribute> for penumbra_pb::Tag {
     }
 }
 
+// impl From<tendermint::abci::event::v0_37::EventAttribute> for penumbra_pb::Tag {
+//     fn from(
+//         tendermint::abci::event::v0_37::EventAttribute {
+//             key,
+//             value,
+//             index: _,
+//         }: tendermint::abci::EventAttribute,
+//     ) -> Self {
+//         Self {
+//             key: key.into_bytes(),
+//             value: value.into_bytes(),
+//             // TODO(kate): this was set to false previously, but it should probably use the
+//             // index field from the tendermint object. for now, carry out a refactor and avoid
+//             // changing behavior while doing so.
+//             index: false,
+//         }
+//     }
+// }
+
 // === broadcast_tx_async ===
 
 impl From<tendermint_rpc::endpoint::broadcast::tx_async::Response>
@@ -89,6 +102,7 @@ impl From<tendermint_rpc::endpoint::broadcast::tx_async::Response>
             data,
             log,
             hash,
+            ..
         }: tendermint_rpc::endpoint::broadcast::tx_async::Response,
     ) -> Self {
         Self {
@@ -111,6 +125,7 @@ impl From<tendermint_rpc::endpoint::broadcast::tx_sync::Response>
             data,
             log,
             hash,
+            ..
         }: tendermint_rpc::endpoint::broadcast::tx_sync::Response,
     ) -> Self {
         Self {
diff --git a/crates/test/mock-consensus/src/block.rs b/crates/test/mock-consensus/src/block.rs
index 7eb45b10a6..ba390b795f 100644
--- a/crates/test/mock-consensus/src/block.rs
+++ b/crates/test/mock-consensus/src/block.rs
@@ -288,7 +288,7 @@ where
             "made block"
         );
         // pass the current value of last_commit with this header
-        let block = Block::new(header.clone(), data, evidence, last_commit)?;
+        let block = Block::new(header.clone(), data, evidence, last_commit);
 
         // Now that the block is finalized, we can transition to the next block.
         // Generate a commit for the header we just made, that will be
diff --git a/crates/util/auto-https/Cargo.toml b/crates/util/auto-https/Cargo.toml
index 6b445cf3f9..3250622b9b 100644
--- a/crates/util/auto-https/Cargo.toml
+++ b/crates/util/auto-https/Cargo.toml
@@ -12,7 +12,7 @@ publish = false
 [dependencies]
 anyhow = {workspace = true}
 futures = {workspace = true}
-rustls = "0.21"
+rustls = "0.23.20"
 axum-server = {workspace = true, features = []}
-rustls-acme = { version = "0.7", features = ["axum"] }
+rustls-acme = { version = "0.12.1", features = ["axum"] }
 tracing = {workspace = true}
diff --git a/crates/util/auto-https/src/lib.rs b/crates/util/auto-https/src/lib.rs
index 50e3133558..3bce7968ec 100644
--- a/crates/util/auto-https/src/lib.rs
+++ b/crates/util/auto-https/src/lib.rs
@@ -45,7 +45,6 @@ pub fn axum_acceptor(
 
     // Define our server configuration, using the ACME certificate resolver.
     let mut rustls_config = ServerConfig::builder()
-        .with_safe_defaults()
         .with_no_client_auth()
         .with_cert_resolver(state.resolver());
     rustls_config.alpn_protocols = self::alpn_protocols();
diff --git a/crates/util/tower-trace/src/lib.rs b/crates/util/tower-trace/src/lib.rs
index 5e60baf249..0992a0f28b 100644
--- a/crates/util/tower-trace/src/lib.rs
+++ b/crates/util/tower-trace/src/lib.rs
@@ -11,7 +11,7 @@ use std::net::SocketAddr;
 // request level, but the hook available to do that gives us an http::Request
 // rather than a tonic::Request, so the tonic::Request::remote_addr method isn't
 // available.
-pub fn remote_addr(req: &http::Request<()>) -> Option<SocketAddr> {
+pub fn remote_addr<B>(req: &http::Request<B>) -> Option<SocketAddr> {
     use tonic::transport::server::TcpConnectInfo;
     // NOTE: needs to also check TlsConnectInfo if we use TLS
     req.extensions()
diff --git a/crates/view/src/storage/sct.rs b/crates/view/src/storage/sct.rs
index dffaa134fb..a3e9bdce86 100644
--- a/crates/view/src/storage/sct.rs
+++ b/crates/view/src/storage/sct.rs
@@ -17,12 +17,13 @@ pub struct TreeStore<'a, 'c: 'a>(pub &'a mut Transaction<'c>);
 impl Read for TreeStore<'_, '_> {
     type Error = anyhow::Error;
 
-    type HashesIter<'a> = Box<dyn Iterator<Item = Result<(Position, u8, Hash), Self::Error>> + 'a>
+    type HashesIter<'a>
+        = Box<dyn Iterator<Item = Result<(Position, u8, Hash), Self::Error>> + 'a>
     where
         Self: 'a;
 
-    type CommitmentsIter<'a> = Box<dyn Iterator<Item = Result<(Position, StateCommitment), Self::Error>>
-        + 'a>
+    type CommitmentsIter<'a>
+        = Box<dyn Iterator<Item = Result<(Position, StateCommitment), Self::Error>> + 'a>
     where
         Self: 'a;
 
diff --git a/crates/view/src/worker.rs b/crates/view/src/worker.rs
index ddc92bc8a8..088db73c09 100644
--- a/crates/view/src/worker.rs
+++ b/crates/view/src/worker.rs
@@ -492,7 +492,7 @@ async fn sct_divergence_check(
     tracing::info!(?height, "fetching anchor @ height");
 
     let value = client
-        .key_value(penumbra_proto::cnidarium::v1::KeyValueRequest {
+        .key_value(cnidarium::proto::v1::KeyValueRequest {
             key: sct_state_key::tree::anchor_by_height(height),
             proof: false,
             ..Default::default()
diff --git a/flake.lock b/flake.lock
index 96be4adf84..bf9a8a311b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,17 +1,12 @@
 {
   "nodes": {
     "crane": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1724537630,
-        "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=",
+        "lastModified": 1734808813,
+        "narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0",
+        "rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926",
         "type": "github"
       },
       "original": {
@@ -25,11 +20,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -40,11 +35,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733808091,
-        "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=",
+        "lastModified": 1734991663,
+        "narHash": "sha256-8T660guvdaOD+2/Cj970bWlQwAyZLKrrbkhYOFcY1YE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e",
+        "rev": "6c90912761c43e22b6fb000025ab96dd31c971ff",
         "type": "github"
       },
       "original": {
@@ -69,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724898214,
-        "narHash": "sha256-4yMO9+Lsr3zqTf4clAGGag/bfNTmc/ITOXbJQcOEok4=",
+        "lastModified": 1735093658,
+        "narHash": "sha256-eIUYGDtairggo7+JXSwN7b6Zr03BJ7tsZL/U0NkDr0s=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0bc2c784e3a6ce30a2ab1b9f47325ccbed13039f",
+        "rev": "ca249a1d98eff27e92665ac462b9d47f58141925",
         "type": "github"
       },
       "original": {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 23e8b42119..7de4ccb549 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,7 +1,7 @@
 [toolchain]
 # We set a specific version of rust so that CI workflows use the same
 # version development environments do.
-channel = "1.80"
+channel = "1.83"
 components = [ "rustfmt", "rust-analyzer" ]
 # Include wasm toolchain, for CI tests to check wasm32 build targets still work,
 # to avoid downstream breakage in `penumbra-wasm` crate, in the web repo.
diff --git a/tools/proto-compiler/Cargo.lock b/tools/proto-compiler/Cargo.lock
index 02560aace3..f60a62414d 100644
--- a/tools/proto-compiler/Cargo.lock
+++ b/tools/proto-compiler/Cargo.lock
@@ -63,7 +63,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -74,9 +74,15 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -85,18 +91,17 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
-version = "0.6.20"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
+checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
 dependencies = [
  "async-trait",
  "axum-core",
- "bitflags 1.3.2",
  "bytes",
  "futures-util",
  "http",
  "http-body",
- "hyper",
+ "http-body-util",
  "itoa",
  "matchit",
  "memchr",
@@ -113,17 +118,20 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.3.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
 dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
  "http",
  "http-body",
+ "http-body-util",
  "mime",
+ "pin-project-lite",
  "rustversion",
+ "sync_wrapper",
  "tower-layer",
  "tower-service",
 ]
@@ -149,6 +157,12 @@ version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
 
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -194,9 +208,9 @@ dependencies = [
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 dependencies = [
  "serde",
 ]
@@ -231,6 +245,17 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
+[[package]]
+name = "cosmos-sdk-proto"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "462e1f6a8e005acc8835d32d60cbd7973ed65ea2a8d8473830e675f050956427"
+dependencies = [
+ "prost",
+ "tendermint-proto",
+ "tonic",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.9"
@@ -289,7 +314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -387,17 +412,17 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "h2"
-version = "0.3.21"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "futures-util",
  "http",
- "indexmap 1.9.3",
+ "indexmap 2.0.2",
  "slab",
  "tokio",
  "tokio-util",
@@ -422,6 +447,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -429,33 +460,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
-name = "home"
-version = "0.5.5"
+name = "http"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
- "windows-sys",
+ "bytes",
+ "fnv",
+ "itoa",
 ]
 
 [[package]]
-name = "http"
-version = "0.2.9"
+name = "http-body"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "fnv",
- "itoa",
+ "http",
 ]
 
 [[package]]
-name = "http-body"
-version = "0.4.5"
+name = "http-body-util"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
+ "futures-util",
  "http",
+ "http-body",
  "pin-project-lite",
 ]
 
@@ -473,13 +507,12 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "0.14.27"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
 dependencies = [
  "bytes",
  "futures-channel",
- "futures-core",
  "futures-util",
  "h2",
  "http",
@@ -488,35 +521,55 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.9",
+ "smallvec",
  "tokio",
- "tower-service",
- "tracing",
  "want",
 ]
 
 [[package]]
 name = "hyper-timeout"
-version = "0.4.1"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
+dependencies = [
+ "hyper",
+ "hyper-util",
+ "pin-project-lite",
+ "tokio",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
  "hyper",
  "pin-project-lite",
+ "socket2",
  "tokio",
- "tokio-io-timeout",
+ "tower-service",
+ "tracing",
 ]
 
 [[package]]
 name = "ibc-proto"
-version = "0.40.0"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4222cfac37f21da28292db0f2673fdb8455284895891ff09979680243efb9a20"
+checksum = "9b70f517162e74e2d35875b8b94bf4d1e45f2c69ef3de452dc855944455d33ca"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "bytes",
+ "cosmos-sdk-proto",
  "flex-error",
  "ics23",
+ "informalsystems-pbjson",
  "prost",
  "subtle-encoding",
  "tendermint-proto",
@@ -525,9 +578,9 @@ dependencies = [
 
 [[package]]
 name = "ics23"
-version = "0.11.3"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18798160736c1e368938ba6967dbcb3c7afb3256b442a5506ba5222eebb68a5a"
+checksum = "73b17f1a5bd7d12ad30a21445cfa5f52fd7651cb3243ba866f9916b1ec112f12"
 dependencies = [
  "anyhow",
  "blake2",
@@ -568,7 +621,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aa4a0980c8379295100d70854354e78df2ee1c6ca0f96ffe89afeb3140e3a3d"
 dependencies = [
- "base64",
+ "base64 0.21.4",
  "serde",
 ]
 
@@ -581,6 +634,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.9"
@@ -598,9 +660,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.149"
+version = "0.2.168"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
 
 [[package]]
 name = "linux-raw-sys"
@@ -643,13 +705,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.8"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
  "wasi",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -658,17 +720,6 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
-[[package]]
-name = "num-derive"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.17"
@@ -701,31 +752,31 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
 [[package]]
 name = "pbjson"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90"
+checksum = "c7e6349fa080353f4a597daffd05cb81572a9c031a6d4fff7e504947496fcc68"
 dependencies = [
- "base64",
+ "base64 0.21.4",
  "serde",
 ]
 
 [[package]]
 name = "pbjson-build"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2580e33f2292d34be285c5bc3dba5259542b083cfad6037b6d70345f24dcb735"
+checksum = "6eea3058763d6e656105d1403cb04e0a41b7bbac6362d413e7c33be0c32279c9"
 dependencies = [
- "heck",
- "itertools",
+ "heck 0.5.0",
+ "itertools 0.13.0",
  "prost",
  "prost-types",
 ]
 
 [[package]]
 name = "pbjson-types"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12"
+checksum = "e54e5e7bfb1652f95bc361d76f3c780d8e526b134b85417e774166ee941f0887"
 dependencies = [
  "bytes",
  "chrono",
@@ -786,7 +837,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -820,7 +871,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -834,9 +885,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.12.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
+checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -844,13 +895,12 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.12.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2"
+checksum = "d0f3e5beed80eb580c68e2c600937ac2c4eedabdfd5ef1e5b7ea4f3fba84497b"
 dependencies = [
- "bytes",
- "heck",
- "itertools",
+ "heck 0.4.1",
+ "itertools 0.11.0",
  "log",
  "multimap",
  "once_cell",
@@ -861,49 +911,48 @@ dependencies = [
  "pulldown-cmark",
  "pulldown-cmark-to-cmark",
  "regex",
- "syn 2.0.38",
+ "syn",
  "tempfile",
- "which",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.12.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
+checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3"
 dependencies = [
  "anyhow",
- "itertools",
+ "itertools 0.11.0",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.12.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"
+checksum = "cc2f1e56baa61e93533aebc21af4d2134b70f66275e0fcdf3cbe43d77ff7e8fc"
 dependencies = [
  "prost",
 ]
 
 [[package]]
 name = "pulldown-cmark"
-version = "0.9.3"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998"
+checksum = "f86ba2052aebccc42cbbb3ed234b8b13ce76f75c3551a303cb2bcffcff12bb14"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "memchr",
  "unicase",
 ]
 
 [[package]]
 name = "pulldown-cmark-to-cmark"
-version = "10.0.4"
+version = "19.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0194e6e1966c23cc5fd988714f85b18d548d773e81965413555d96569931833d"
+checksum = "e84a87de49d1b6c63f0998da7ade299905387ae1feae350efc98e0632637f589"
 dependencies = [
  "pulldown-cmark",
 ]
@@ -1010,7 +1059,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1045,7 +1094,7 @@ checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -1079,23 +1128,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "socket2"
-version = "0.4.9"
+name = "smallvec"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
-dependencies = [
- "libc",
- "winapi",
-]
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.5.4"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1113,17 +1158,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "syn"
 version = "2.0.38"
@@ -1137,9 +1171,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "0.1.2"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 
 [[package]]
 name = "tempfile"
@@ -1151,21 +1185,18 @@ dependencies = [
  "fastrand",
  "redox_syscall",
  "rustix",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tendermint-proto"
-version = "0.34.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc728a4f9e891d71adf66af6ecaece146f9c7a11312288a3107b3e1d6979aaf"
+checksum = "c81ba1b023ec00763c3bc4f4376c67c0047f185cccf95c416c7a2f16272c4cbb"
 dependencies = [
  "bytes",
  "flex-error",
- "num-derive",
- "num-traits",
  "prost",
- "prost-types",
  "serde",
  "serde_bytes",
  "subtle-encoding",
@@ -1201,34 +1232,36 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.33.0"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
  "pin-project-lite",
- "socket2 0.5.4",
- "windows-sys",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "tokio-io-timeout"
-version = "1.2.0"
+name = "tokio-macros"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
- "pin-project-lite",
- "tokio",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -1251,23 +1284,26 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.10.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
+checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
 dependencies = [
  "async-stream",
  "async-trait",
  "axum",
- "base64",
+ "base64 0.22.1",
  "bytes",
  "h2",
  "http",
  "http-body",
+ "http-body-util",
  "hyper",
  "hyper-timeout",
+ "hyper-util",
  "percent-encoding",
  "pin-project",
  "prost",
+ "socket2",
  "tokio",
  "tokio-stream",
  "tower",
@@ -1278,15 +1314,16 @@ dependencies = [
 
 [[package]]
 name = "tonic-build"
-version = "0.10.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889"
+checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11"
 dependencies = [
  "prettyplease",
  "proc-macro2",
  "prost-build",
+ "prost-types",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -1340,7 +1377,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -1401,61 +1438,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "which"
-version = "4.4.2"
+name = "windows-sys"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
-name = "winapi"
-version = "0.3.9"
+name = "windows-sys"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
+name = "windows-targets"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows-targets",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -1464,42 +1492,90 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
 [[package]]
 name = "zeroize"
 version = "1.6.0"
diff --git a/tools/proto-compiler/Cargo.toml b/tools/proto-compiler/Cargo.toml
index 43dc1cab78..de3295b4a0 100644
--- a/tools/proto-compiler/Cargo.toml
+++ b/tools/proto-compiler/Cargo.toml
@@ -6,13 +6,13 @@ publish = false
 
 [dependencies]
 anyhow = "1"
-ibc-proto = { version = "0.40.0" }
-ics23 = "0.11.3"
-pbjson = "0.6"
-pbjson-build = "0.6"
-pbjson-types = "0.6"
-prost = "0.12.3"
-prost-build = "0.12.3"
-prost-types = "0.12"
+ibc-proto = { version = "0.51.1" }
+ics23 = "0.12.0"
+pbjson = "0.7.0"
+pbjson-build = "0.7.0"
+pbjson-types = "0.7.0"
+prost = "0.13.3"
+prost-build = "0.13.3"
+prost-types = "0.13.3"
 tempfile = "3"
-tonic-build = { version = "0.10.0", features = ["cleanup-markdown"] }
+tonic-build = { version = "0.12.3", features = ["cleanup-markdown"] }
diff --git a/tools/proto-compiler/src/main.rs b/tools/proto-compiler/src/main.rs
index 8915c3d811..54f3d49547 100644
--- a/tools/proto-compiler/src/main.rs
+++ b/tools/proto-compiler/src/main.rs
@@ -4,13 +4,6 @@ fn main() -> anyhow::Result<()> {
     let root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     println!("root: {}", root.display());
 
-    // We build the proto files for the main penumbra_proto crate
-    // and for the cnidarium crate separately, because the
-    // cnidarium crate is supposed to be independent of the
-    // rest of the Penumbra codebase and its proto structures.
-    // Unfortunately, this means duplicating a lot of logic, because
-    // we can't share the prost_build::Config between the two.
-
     let target_dir = root
         .join("..")
         .join("..")
@@ -18,16 +11,8 @@ fn main() -> anyhow::Result<()> {
         .join("proto")
         .join("src")
         .join("gen");
-    let cnidarium_target_dir = root
-        .join("..")
-        .join("..")
-        .join("crates")
-        .join("cnidarium")
-        .join("src")
-        .join("gen");
 
     println!("target_dir: {}", target_dir.display());
-    println!("cnidarium_target_dir: {}", cnidarium_target_dir.display());
 
     // https://github.com/penumbra-zone/penumbra/issues/3038#issuecomment-1722534133
     // Using the "no_lfs" suffix prevents matching a catch-all LFS rule.
@@ -35,7 +20,6 @@ fn main() -> anyhow::Result<()> {
 
     // prost_build::Config isn't Clone, so we need to make two.
     let mut config = prost_build::Config::new();
-    let mut cnidarium_config = prost_build::Config::new();
 
     config.compile_well_known_types();
     // As recommended in pbjson_types docs.
@@ -48,34 +32,13 @@ fn main() -> anyhow::Result<()> {
     config.extern_path(".ics23", "::ics23");
     config.extern_path(".cosmos.ics23", "::ics23");
 
-    cnidarium_config.compile_well_known_types();
-    cnidarium_config.extern_path(".google.protobuf", "::pbjson_types");
-    cnidarium_config.extern_path(".ibc", "::ibc_proto::ibc");
-    cnidarium_config.extern_path(".ics23", "::ics23");
-    cnidarium_config.extern_path(".cosmos.ics23", "::ics23");
-
     config
         .out_dir(&target_dir)
         .file_descriptor_set_path(&target_dir.join(descriptor_file_name))
         .enable_type_names();
-    cnidarium_config
-        .out_dir(&cnidarium_target_dir)
-        .file_descriptor_set_path(&cnidarium_target_dir.join(descriptor_file_name))
-        .enable_type_names();
 
     let rpc_doc_attr = r#"#[cfg(feature = "rpc")]"#;
 
-    tonic_build::configure()
-        .out_dir(&cnidarium_target_dir)
-        .emit_rerun_if_changed(false)
-        .server_mod_attribute(".", rpc_doc_attr)
-        .client_mod_attribute(".", rpc_doc_attr)
-        .compile_with_config(
-            cnidarium_config,
-            &["../../proto/penumbra/penumbra/cnidarium/v1/cnidarium.proto"],
-            &["../../proto/penumbra/", "../../proto/rust-vendored/"],
-        )?;
-
     tonic_build::configure()
         .out_dir(&target_dir)
         .emit_rerun_if_changed(false)
@@ -84,7 +47,7 @@ fn main() -> anyhow::Result<()> {
         // We need to feature-gate the RPCs.
         .server_mod_attribute(".", rpc_doc_attr)
         .client_mod_attribute(".", rpc_doc_attr)
-        .compile_with_config(
+        .compile_protos_with_config(
             config,
             &[
                 "../../proto/penumbra/penumbra/core/app/v1/app.proto",
@@ -111,8 +74,6 @@ fn main() -> anyhow::Result<()> {
                 "../../proto/penumbra/penumbra/crypto/tct/v1/tct.proto",
                 "../../proto/penumbra/penumbra/custody/v1/custody.proto",
                 "../../proto/penumbra/penumbra/custody/threshold/v1/threshold.proto",
-                // Also included in the cnidarium crate directly.
-                "../../proto/penumbra/penumbra/cnidarium/v1/cnidarium.proto",
                 "../../proto/penumbra/penumbra/tools/summoning/v1/summoning.proto",
                 "../../proto/penumbra/penumbra/util/tendermint_proxy/v1/tendermint_proxy.proto",
                 "../../proto/penumbra/penumbra/view/v1/view.proto",
@@ -141,13 +102,6 @@ fn main() -> anyhow::Result<()> {
 
     // Finally, build pbjson Serialize, Deserialize impls:
     let descriptor_set = std::fs::read(target_dir.join(descriptor_file_name))?;
-    let cnidarium_descriptor_set = std::fs::read(cnidarium_target_dir.join(descriptor_file_name))?;
-
-    pbjson_build::Builder::new()
-        .register_descriptors(&cnidarium_descriptor_set)?
-        .ignore_unknown_fields()
-        .out_dir(&cnidarium_target_dir)
-        .build(&[".penumbra"])?;
 
     pbjson_build::Builder::new()
         .register_descriptors(&descriptor_set)?
diff --git a/tools/summonerd/src/main.rs b/tools/summonerd/src/main.rs
index c051af56af..8d819ffa1d 100644
--- a/tools/summonerd/src/main.rs
+++ b/tools/summonerd/src/main.rs
@@ -8,6 +8,7 @@ mod server;
 mod storage;
 mod web;
 
+use anyhow::Context as _;
 use anyhow::Result;
 use ark_groth16::{ProvingKey, VerifyingKey};
 use ark_serialize::CanonicalSerialize;
@@ -33,7 +34,7 @@ use std::io::IsTerminal as _;
 use std::io::Read;
 use std::net::SocketAddr;
 use storage::Storage;
-use tonic::transport::Server;
+use tonic::service::Routes;
 use tracing::Instrument;
 use tracing_subscriber::{prelude::*, EnvFilter};
 use url::Url;
@@ -206,11 +207,13 @@ impl Opt {
                 };
                 let service =
                     CoordinatorService::new(knower, storage.clone(), queue.clone(), marker);
-                let grpc_server = Server::builder().add_service(
+
+                let routes = Routes::new(
                     CeremonyCoordinatorServiceServer::new(service)
                         .max_encoding_message_size(max_message_size(marker))
                         .max_decoding_message_size(max_message_size(marker)),
-                );
+                )
+                .prepare();
 
                 let web_app = web_app(
                     fvk.payment_address(0u32.into()).0,
@@ -220,11 +223,13 @@ impl Opt {
                     storage,
                 );
 
-                let router = grpc_server.into_router().merge(web_app);
+                let router = routes.into_axum_router().merge(web_app);
 
                 tracing::info!(?bind_addr, "starting grpc and web server");
-                let server_handle =
-                    axum::Server::bind(&bind_addr).serve(router.into_make_service());
+                let listener = tokio::net::TcpListener::bind(&bind_addr)
+                    .await
+                    .with_context(|| format!("failed to bind TCP socket addr `{bind_addr}`"))?;
+                let server_handle = axum::serve(listener, router);
 
                 // TODO: better error reporting
                 // We error out if a service errors, rather than keep running
diff --git a/tools/summonerd/src/web.rs b/tools/summonerd/src/web.rs
index a358e40fa7..c2a142f9ed 100644
--- a/tools/summonerd/src/web.rs
+++ b/tools/summonerd/src/web.rs
@@ -30,7 +30,7 @@ async fn serve_summoning_jpg() -> impl IntoResponse {
         .status(StatusCode::OK)
         .header("Content-Type", "image/jpeg")
         .header("Cache-Control", "public, max-age=3600") // Cache for 1 hour
-        .body(axum::body::Full::from(jpg))
+        .body(axum::body::Body::from(jpg))
         .unwrap()
 }
 
@@ -40,7 +40,7 @@ async fn serve_css() -> impl IntoResponse {
         .status(StatusCode::OK)
         .header("Content-Type", "text/css")
         .header("Cache-Control", "public, max-age=3600") // Cache for 1 hour
-        .body(axum::body::Full::from(css))
+        .body(axum::body::Body::from(css))
         .unwrap()
 }
 
@@ -62,7 +62,7 @@ async fn serve_woff2(filename: &str) -> impl IntoResponse {
         .status(StatusCode::OK)
         .header("Content-Type", "font/woff2")
         .header("Cache-Control", "public, max-age=3600") // Cache for 1 hour
-        .body(axum::body::Full::from(data))
+        .body(axum::body::Body::from(data))
         .unwrap()
 }