diff --git a/crates/cnidarium/src/gen/proto_descriptor.bin.no_lfs b/crates/cnidarium/src/gen/proto_descriptor.bin.no_lfs index 2473a12985..d50e1bd881 100644 Binary files a/crates/cnidarium/src/gen/proto_descriptor.bin.no_lfs and b/crates/cnidarium/src/gen/proto_descriptor.bin.no_lfs differ diff --git a/crates/proto/src/gen/penumbra.core.transaction.v1.rs b/crates/proto/src/gen/penumbra.core.transaction.v1.rs index 5cab6232f1..b27d93c1fa 100644 --- a/crates/proto/src/gen/penumbra.core.transaction.v1.rs +++ b/crates/proto/src/gen/penumbra.core.transaction.v1.rs @@ -400,7 +400,7 @@ impl ::prost::Name for TransactionBodyView { pub struct ActionView { #[prost( oneof = "action_view::ActionView", - tags = "1, 2, 3, 4, 16, 17, 18, 19, 20, 21, 22, 30, 31, 32, 34, 41, 42, 50, 51, 52, 53, 54, 55, 43, 200" + tags = "1, 2, 3, 4, 21, 16, 17, 18, 19, 20, 22, 30, 31, 32, 34, 41, 42, 50, 51, 52, 53, 54, 55, 43, 200" )] pub action_view: ::core::option::Option, } @@ -418,6 +418,8 @@ pub mod action_view { Swap(super::super::super::component::dex::v1::SwapView), #[prost(message, tag = "4")] SwapClaim(super::super::super::component::dex::v1::SwapClaimView), + #[prost(message, tag = "21")] + DelegatorVote(super::super::super::component::governance::v1::DelegatorVoteView), /// Action types without visible/opaque variants #[prost(message, tag = "16")] ValidatorDefinition( @@ -434,8 +436,6 @@ pub mod action_view { ), #[prost(message, tag = "20")] ValidatorVote(super::super::super::component::governance::v1::ValidatorVote), - #[prost(message, tag = "21")] - DelegatorVote(super::super::super::component::governance::v1::DelegatorVoteView), #[prost(message, tag = "22")] ProposalDepositClaim( super::super::super::component::governance::v1::ProposalDepositClaim, 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 c754bce6b3..63d055c45a 100644 --- a/crates/proto/src/gen/penumbra.core.transaction.v1.serde.rs +++ b/crates/proto/src/gen/penumbra.core.transaction.v1.serde.rs @@ -888,6 +888,9 @@ impl serde::Serialize for ActionView { action_view::ActionView::SwapClaim(v) => { struct_ser.serialize_field("swapClaim", v)?; } + action_view::ActionView::DelegatorVote(v) => { + struct_ser.serialize_field("delegatorVote", v)?; + } action_view::ActionView::ValidatorDefinition(v) => { struct_ser.serialize_field("validatorDefinition", v)?; } @@ -903,9 +906,6 @@ impl serde::Serialize for ActionView { action_view::ActionView::ValidatorVote(v) => { struct_ser.serialize_field("validatorVote", v)?; } - action_view::ActionView::DelegatorVote(v) => { - struct_ser.serialize_field("delegatorVote", v)?; - } action_view::ActionView::ProposalDepositClaim(v) => { struct_ser.serialize_field("proposalDepositClaim", v)?; } @@ -968,6 +968,8 @@ impl<'de> serde::Deserialize<'de> for ActionView { "swap", "swap_claim", "swapClaim", + "delegator_vote", + "delegatorVote", "validator_definition", "validatorDefinition", "ibc_relay_action", @@ -978,8 +980,6 @@ impl<'de> serde::Deserialize<'de> for ActionView { "proposalWithdraw", "validator_vote", "validatorVote", - "delegator_vote", - "delegatorVote", "proposal_deposit_claim", "proposalDepositClaim", "position_open", @@ -1016,12 +1016,12 @@ impl<'de> serde::Deserialize<'de> for ActionView { Output, Swap, SwapClaim, + DelegatorVote, ValidatorDefinition, IbcRelayAction, ProposalSubmit, ProposalWithdraw, ValidatorVote, - DelegatorVote, ProposalDepositClaim, PositionOpen, PositionClose, @@ -1063,12 +1063,12 @@ impl<'de> serde::Deserialize<'de> for ActionView { "output" => Ok(GeneratedField::Output), "swap" => Ok(GeneratedField::Swap), "swapClaim" | "swap_claim" => Ok(GeneratedField::SwapClaim), + "delegatorVote" | "delegator_vote" => Ok(GeneratedField::DelegatorVote), "validatorDefinition" | "validator_definition" => Ok(GeneratedField::ValidatorDefinition), "ibcRelayAction" | "ibc_relay_action" => Ok(GeneratedField::IbcRelayAction), "proposalSubmit" | "proposal_submit" => Ok(GeneratedField::ProposalSubmit), "proposalWithdraw" | "proposal_withdraw" => Ok(GeneratedField::ProposalWithdraw), "validatorVote" | "validator_vote" => Ok(GeneratedField::ValidatorVote), - "delegatorVote" | "delegator_vote" => Ok(GeneratedField::DelegatorVote), "proposalDepositClaim" | "proposal_deposit_claim" => Ok(GeneratedField::ProposalDepositClaim), "positionOpen" | "position_open" => Ok(GeneratedField::PositionOpen), "positionClose" | "position_close" => Ok(GeneratedField::PositionClose), @@ -1132,6 +1132,13 @@ impl<'de> serde::Deserialize<'de> for ActionView { return Err(serde::de::Error::duplicate_field("swapClaim")); } action_view__ = map_.next_value::<::std::option::Option<_>>()?.map(action_view::ActionView::SwapClaim) +; + } + GeneratedField::DelegatorVote => { + if action_view__.is_some() { + return Err(serde::de::Error::duplicate_field("delegatorVote")); + } + action_view__ = map_.next_value::<::std::option::Option<_>>()?.map(action_view::ActionView::DelegatorVote) ; } GeneratedField::ValidatorDefinition => { @@ -1167,13 +1174,6 @@ impl<'de> serde::Deserialize<'de> for ActionView { return Err(serde::de::Error::duplicate_field("validatorVote")); } action_view__ = map_.next_value::<::std::option::Option<_>>()?.map(action_view::ActionView::ValidatorVote) -; - } - GeneratedField::DelegatorVote => { - if action_view__.is_some() { - return Err(serde::de::Error::duplicate_field("delegatorVote")); - } - action_view__ = map_.next_value::<::std::option::Option<_>>()?.map(action_view::ActionView::DelegatorVote) ; } GeneratedField::ProposalDepositClaim => { diff --git a/crates/proto/src/gen/proto_descriptor.bin.no_lfs b/crates/proto/src/gen/proto_descriptor.bin.no_lfs index 78f7ce73c8..308b58ada5 100644 Binary files a/crates/proto/src/gen/proto_descriptor.bin.no_lfs and b/crates/proto/src/gen/proto_descriptor.bin.no_lfs differ diff --git a/proto/penumbra/penumbra/core/transaction/v1/transaction.proto b/proto/penumbra/penumbra/core/transaction/v1/transaction.proto index 1e0564ead0..aa6e2e2e82 100644 --- a/proto/penumbra/penumbra/core/transaction/v1/transaction.proto +++ b/proto/penumbra/penumbra/core/transaction/v1/transaction.proto @@ -199,6 +199,7 @@ message ActionView { component.shielded_pool.v1.OutputView output = 2; component.dex.v1.SwapView swap = 3; component.dex.v1.SwapClaimView swap_claim = 4; + component.governance.v1.DelegatorVoteView delegator_vote = 21; // Action types without visible/opaque variants component.stake.v1.ValidatorDefinition validator_definition = 16; @@ -208,7 +209,6 @@ message ActionView { component.governance.v1.ProposalSubmit proposal_submit = 18; component.governance.v1.ProposalWithdraw proposal_withdraw = 19; component.governance.v1.ValidatorVote validator_vote = 20; - component.governance.v1.DelegatorVoteView delegator_vote = 21; component.governance.v1.ProposalDepositClaim proposal_deposit_claim = 22; component.dex.v1.PositionOpen position_open = 30;