diff --git a/crates/bin/pcli/src/command/query/auction.rs b/crates/bin/pcli/src/command/query/auction.rs index 644be7ba19..ab68b45947 100644 --- a/crates/bin/pcli/src/command/query/auction.rs +++ b/crates/bin/pcli/src/command/query/auction.rs @@ -10,9 +10,9 @@ use penumbra_auction::auction::AuctionId; use penumbra_dex::lp::position::{self, Position}; use penumbra_num::fixpoint::U128x128; use penumbra_num::Amount; -use penumbra_proto::core::component::auction::v1alpha1 as pb_auction; -use penumbra_proto::core::component::auction::v1alpha1::query_service_client::QueryServiceClient as AuctionQueryServiceClient; -use penumbra_proto::core::component::auction::v1alpha1::AuctionStateByIdRequest; +use penumbra_proto::core::component::auction::v1 as pb_auction; +use penumbra_proto::core::component::auction::v1::query_service_client::QueryServiceClient as AuctionQueryServiceClient; +use penumbra_proto::core::component::auction::v1::AuctionStateByIdRequest; use penumbra_proto::core::component::dex::v1::query_service_client::QueryServiceClient as DexQueryServiceClient; use penumbra_proto::core::component::dex::v1::LiquidityPositionByIdRequest; use penumbra_proto::DomainType; diff --git a/crates/bin/pcli/src/command/tx/auction/dutch/mod.rs b/crates/bin/pcli/src/command/tx/auction/dutch/mod.rs index 3cfd72599b..1dc57cb14f 100644 --- a/crates/bin/pcli/src/command/tx/auction/dutch/mod.rs +++ b/crates/bin/pcli/src/command/tx/auction/dutch/mod.rs @@ -229,7 +229,7 @@ impl DutchCmd { bail!("auction state is missing from view server response") }; - use penumbra_proto::core::component::auction::v1alpha1 as pb_auction; + use penumbra_proto::core::component::auction::v1 as pb_auction; // We're processing a Dutch auction: assert_eq!(raw_da_state.type_url, pb_auction::DutchAuction::type_url()); diff --git a/crates/bin/pcli/src/command/view/auction.rs b/crates/bin/pcli/src/command/view/auction.rs index 16fdfee421..c73e33ab8a 100644 --- a/crates/bin/pcli/src/command/view/auction.rs +++ b/crates/bin/pcli/src/command/view/auction.rs @@ -2,7 +2,7 @@ use anyhow::Result; use comfy_table::{presets, Cell, ContentArrangement, Table}; use penumbra_auction::auction::dutch::DutchAuction; use penumbra_keys::FullViewingKey; -use penumbra_proto::{core::component::auction::v1alpha1 as pb_auction, DomainType, Name}; +use penumbra_proto::{core::component::auction::v1 as pb_auction, DomainType, Name}; use penumbra_view::ViewClient; use crate::command::query::auction::render_dutch_auction; diff --git a/crates/core/app/src/rpc.rs b/crates/core/app/src/rpc.rs index 99f276d027..b7047c5eab 100644 --- a/crates/core/app/src/rpc.rs +++ b/crates/core/app/src/rpc.rs @@ -28,7 +28,7 @@ use { core::{ app::v1::query_service_server::QueryServiceServer as AppQueryServiceServer, component::{ - auction::v1alpha1::query_service_server::QueryServiceServer as AuctionQueryServiceServer, + auction::v1::query_service_server::QueryServiceServer as AuctionQueryServiceServer, compact_block::v1::query_service_server::QueryServiceServer as CompactBlockQueryServiceServer, dex::v1::{ query_service_server::QueryServiceServer as DexQueryServiceServer, diff --git a/crates/core/component/auction/src/auction/dutch.rs b/crates/core/component/auction/src/auction/dutch.rs index 238461f746..804fdef667 100644 --- a/crates/core/component/auction/src/auction/dutch.rs +++ b/crates/core/component/auction/src/auction/dutch.rs @@ -4,7 +4,7 @@ use anyhow::anyhow; use penumbra_asset::{asset, Value}; use penumbra_dex::lp::position::{self}; use penumbra_num::Amount; -use penumbra_proto::{core::component::auction::v1alpha1 as pb, DomainType}; +use penumbra_proto::{core::component::auction::v1 as pb, DomainType}; use serde::{Deserialize, Serialize}; use crate::auction::AuctionId; diff --git a/crates/core/component/auction/src/auction/dutch/actions/end.rs b/crates/core/component/auction/src/auction/dutch/actions/end.rs index b0ce842fb5..8bc436c42c 100644 --- a/crates/core/component/auction/src/auction/dutch/actions/end.rs +++ b/crates/core/component/auction/src/auction/dutch/actions/end.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use penumbra_asset::{Balance, Value}; -use penumbra_proto::{core::component::auction::v1alpha1 as pb, DomainType}; +use penumbra_proto::{core::component::auction::v1 as pb, DomainType}; use penumbra_txhash::{EffectHash, EffectingData}; use serde::{Deserialize, Serialize}; diff --git a/crates/core/component/auction/src/auction/dutch/actions/plan.rs b/crates/core/component/auction/src/auction/dutch/actions/plan.rs index 18ae8e2917..dca1265ba1 100644 --- a/crates/core/component/auction/src/auction/dutch/actions/plan.rs +++ b/crates/core/component/auction/src/auction/dutch/actions/plan.rs @@ -1,7 +1,7 @@ use ark_ff::Zero; use decaf377::Fr; use penumbra_asset::{balance, Balance, Value}; -use penumbra_proto::{penumbra::core::component::auction::v1alpha1 as pb, DomainType}; +use penumbra_proto::{penumbra::core::component::auction::v1 as pb, DomainType}; use serde::{Deserialize, Serialize}; use crate::auction::{dutch::ActionDutchAuctionWithdraw, AuctionId, AuctionNft}; diff --git a/crates/core/component/auction/src/auction/dutch/actions/schedule.rs b/crates/core/component/auction/src/auction/dutch/actions/schedule.rs index 9742aebb5d..349371041f 100644 --- a/crates/core/component/auction/src/auction/dutch/actions/schedule.rs +++ b/crates/core/component/auction/src/auction/dutch/actions/schedule.rs @@ -1,7 +1,7 @@ use crate::auction::{dutch::DutchAuctionDescription, nft::AuctionNft}; use anyhow::anyhow; use penumbra_asset::{Balance, Value}; -use penumbra_proto::{core::component::auction::v1alpha1 as pb, DomainType}; +use penumbra_proto::{core::component::auction::v1 as pb, DomainType}; use penumbra_txhash::{EffectHash, EffectingData}; use serde::{Deserialize, Serialize}; diff --git a/crates/core/component/auction/src/auction/dutch/actions/view.rs b/crates/core/component/auction/src/auction/dutch/actions/view.rs index bee10a6329..b1a3861750 100644 --- a/crates/core/component/auction/src/auction/dutch/actions/view.rs +++ b/crates/core/component/auction/src/auction/dutch/actions/view.rs @@ -7,7 +7,7 @@ use crate::auction::{ }; use anyhow::anyhow; use penumbra_asset::ValueView; -use penumbra_proto::{core::component::auction::v1alpha1 as pb, DomainType}; +use penumbra_proto::{core::component::auction::v1 as pb, DomainType}; use serde::{Deserialize, Serialize}; /* Domain type definitions */ diff --git a/crates/core/component/auction/src/auction/dutch/actions/withdraw.rs b/crates/core/component/auction/src/auction/dutch/actions/withdraw.rs index b40e0ade45..6266b8e836 100644 --- a/crates/core/component/auction/src/auction/dutch/actions/withdraw.rs +++ b/crates/core/component/auction/src/auction/dutch/actions/withdraw.rs @@ -3,7 +3,7 @@ use anyhow::anyhow; use ark_ff::Zero; use decaf377_rdsa::Fr; use penumbra_asset::{balance, Balance, Value}; -use penumbra_proto::{core::component::auction::v1alpha1 as pb, DomainType}; +use penumbra_proto::{core::component::auction::v1 as pb, DomainType}; use penumbra_txhash::{EffectHash, EffectingData}; use serde::{Deserialize, Serialize}; diff --git a/crates/core/component/auction/src/auction/id.rs b/crates/core/component/auction/src/auction/id.rs index d78c1895c7..767b6ffc1f 100644 --- a/crates/core/component/auction/src/auction/id.rs +++ b/crates/core/component/auction/src/auction/id.rs @@ -1,6 +1,6 @@ use anyhow::{bail, Context}; use penumbra_proto::{ - penumbra::core::component::auction::v1alpha1 as pb, serializers::bech32str, DomainType, + penumbra::core::component::auction::v1 as pb, serializers::bech32str, DomainType, }; use serde::{Deserialize, Serialize}; diff --git a/crates/core/component/auction/src/auction/nft.rs b/crates/core/component/auction/src/auction/nft.rs index 0147dd585a..f5dc11d22a 100644 --- a/crates/core/component/auction/src/auction/nft.rs +++ b/crates/core/component/auction/src/auction/nft.rs @@ -1,7 +1,7 @@ use crate::auction::id::AuctionId; use anyhow::{anyhow, Result}; use penumbra_asset::asset::{self, Metadata}; -use penumbra_proto::{core::component::auction::v1alpha1 as pb, DomainType}; +use penumbra_proto::{core::component::auction::v1 as pb, DomainType}; use regex::Regex; /// An non-fungible token (NFT) tracking the state and ownership of an auction. diff --git a/crates/core/component/auction/src/component/auction_store.rs b/crates/core/component/auction/src/component/auction_store.rs index 6d6669057c..35b93a9183 100644 --- a/crates/core/component/auction/src/component/auction_store.rs +++ b/crates/core/component/auction/src/component/auction_store.rs @@ -2,7 +2,7 @@ use anyhow::Result; use async_trait::async_trait; use cnidarium::StateRead; use pbjson_types::Any; -use penumbra_proto::core::component::auction::v1alpha1 as pb; +use penumbra_proto::core::component::auction::v1 as pb; use penumbra_proto::DomainType; use penumbra_proto::Name; use penumbra_proto::StateReadProto; diff --git a/crates/core/component/auction/src/component/dutch_auction.rs b/crates/core/component/auction/src/component/dutch_auction.rs index 33a0307702..93fc65e8da 100644 --- a/crates/core/component/auction/src/component/dutch_auction.rs +++ b/crates/core/component/auction/src/component/dutch_auction.rs @@ -17,7 +17,7 @@ use penumbra_dex::lp::position::{self, Position}; use penumbra_dex::lp::Reserves; use penumbra_dex::DirectedTradingPair; use penumbra_num::Amount; -use penumbra_proto::core::component::auction::v1alpha1 as pb; +use penumbra_proto::core::component::auction::v1 as pb; use penumbra_proto::StateWriteProto; use penumbra_sct::component::clock::EpochRead; use prost::{Message, Name}; diff --git a/crates/core/component/auction/src/component/rpc.rs b/crates/core/component/auction/src/component/rpc.rs index 2a33d18ae3..5165ce8065 100755 --- a/crates/core/component/auction/src/component/rpc.rs +++ b/crates/core/component/auction/src/component/rpc.rs @@ -2,8 +2,8 @@ use penumbra_dex::{component::PositionRead, lp::position}; use penumbra_proto::{ - core::component::auction::v1alpha1 as pb, - core::component::auction::v1alpha1::{ + core::component::auction::v1 as pb, + core::component::auction::v1::{ query_service_server::QueryService, AuctionStateByIdRequest, AuctionStateByIdResponse, AuctionStateByIdsRequest, AuctionStateByIdsResponse, DutchAuctionState, }, diff --git a/crates/core/component/auction/src/event.rs b/crates/core/component/auction/src/event.rs index f3942f4286..f170bd0909 100644 --- a/crates/core/component/auction/src/event.rs +++ b/crates/core/component/auction/src/event.rs @@ -2,7 +2,7 @@ use crate::auction::dutch::{DutchAuctionDescription, DutchAuctionState}; use crate::auction::AuctionId; use penumbra_asset::asset; use penumbra_num::Amount; -use penumbra_proto::penumbra::core::component::auction::v1alpha1 as pb; +use penumbra_proto::penumbra::core::component::auction::v1 as pb; /// Event for a Dutch auction that has been scheduled. pub fn dutch_auction_schedule_event( diff --git a/crates/core/component/auction/src/genesis.rs b/crates/core/component/auction/src/genesis.rs index 84ee043ec1..52f78277d5 100644 --- a/crates/core/component/auction/src/genesis.rs +++ b/crates/core/component/auction/src/genesis.rs @@ -2,7 +2,7 @@ use crate::params::AuctionParameters; use anyhow::Context; use serde::{Deserialize, Serialize}; -use penumbra_proto::{penumbra::core::component::auction::v1alpha1 as pb, DomainType}; +use penumbra_proto::{penumbra::core::component::auction::v1 as pb, DomainType}; #[derive(Deserialize, Serialize, Debug, Clone, Default)] #[serde(try_from = "pb::GenesisContent", into = "pb::GenesisContent")] diff --git a/crates/core/component/auction/src/params.rs b/crates/core/component/auction/src/params.rs index a257468c28..dded262c56 100644 --- a/crates/core/component/auction/src/params.rs +++ b/crates/core/component/auction/src/params.rs @@ -1,4 +1,4 @@ -use penumbra_proto::core::component::auction::v1alpha1 as pb; +use penumbra_proto::core::component::auction::v1 as pb; use penumbra_proto::DomainType; use serde::{Deserialize, Serialize}; diff --git a/crates/proto/src/gen/penumbra.core.app.v1.rs b/crates/proto/src/gen/penumbra.core.app.v1.rs index 0fea6965d8..ced7c4b31f 100644 --- a/crates/proto/src/gen/penumbra.core.app.v1.rs +++ b/crates/proto/src/gen/penumbra.core.app.v1.rs @@ -92,7 +92,7 @@ pub struct AppParameters { /// Auction module parameters. #[prost(message, optional, tag = "12")] pub auction_params: ::core::option::Option< - super::super::component::auction::v1alpha1::AuctionParameters, + super::super::component::auction::v1::AuctionParameters, >, } impl ::prost::Name for AppParameters { @@ -209,7 +209,7 @@ pub struct GenesisContent { /// Auction component genesis state. #[prost(message, optional, tag = "12")] pub auction_content: ::core::option::Option< - super::super::component::auction::v1alpha1::GenesisContent, + super::super::component::auction::v1::GenesisContent, >, } impl ::prost::Name for GenesisContent { diff --git a/crates/proto/src/gen/penumbra.core.component.auction.v1alpha1.rs b/crates/proto/src/gen/penumbra.core.component.auction.v1.rs similarity index 91% rename from crates/proto/src/gen/penumbra.core.component.auction.v1alpha1.rs rename to crates/proto/src/gen/penumbra.core.component.auction.v1.rs index 1effa724c2..5c17e61b21 100644 --- a/crates/proto/src/gen/penumbra.core.component.auction.v1alpha1.rs +++ b/crates/proto/src/gen/penumbra.core.component.auction.v1.rs @@ -4,11 +4,9 @@ pub struct AuctionParameters {} impl ::prost::Name for AuctionParameters { const NAME: &'static str = "AuctionParameters"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } /// Genesis data for the auction component. @@ -21,11 +19,9 @@ pub struct GenesisContent { } impl ::prost::Name for GenesisContent { const NAME: &'static str = "GenesisContent"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -36,11 +32,9 @@ pub struct AuctionStateByIdRequest { } impl ::prost::Name for AuctionStateByIdRequest { const NAME: &'static str = "AuctionStateByIdRequest"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -57,11 +51,9 @@ pub struct AuctionStateByIdResponse { } impl ::prost::Name for AuctionStateByIdResponse { const NAME: &'static str = "AuctionStateByIdResponse"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -73,11 +65,9 @@ pub struct AuctionStateByIdsRequest { } impl ::prost::Name for AuctionStateByIdsRequest { const NAME: &'static str = "AuctionStateByIdsRequest"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -97,11 +87,9 @@ pub struct AuctionStateByIdsResponse { } impl ::prost::Name for AuctionStateByIdsResponse { const NAME: &'static str = "AuctionStateByIdsResponse"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } /// A unique identifier for an auction, obtained from hashing a domain separator @@ -114,11 +102,9 @@ pub struct AuctionId { } impl ::prost::Name for AuctionId { const NAME: &'static str = "AuctionId"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } /// A bearer NFT tracking ownership of an auction and its proceeds. @@ -132,11 +118,9 @@ pub struct AuctionNft { } impl ::prost::Name for AuctionNft { const NAME: &'static str = "AuctionNft"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } /// Describes a Dutch auction using programmatic liquidity on the DEX. @@ -182,11 +166,9 @@ pub struct DutchAuctionDescription { } impl ::prost::Name for DutchAuctionDescription { const NAME: &'static str = "DutchAuctionDescription"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -219,11 +201,9 @@ pub struct DutchAuctionState { } impl ::prost::Name for DutchAuctionState { const NAME: &'static str = "DutchAuctionState"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -238,11 +218,9 @@ pub struct DutchAuction { } impl ::prost::Name for DutchAuction { const NAME: &'static str = "DutchAuction"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } /// Initiates a Dutch auction using protocol-controlled liquidity. @@ -254,11 +232,9 @@ pub struct ActionDutchAuctionSchedule { } impl ::prost::Name for ActionDutchAuctionSchedule { const NAME: &'static str = "ActionDutchAuctionSchedule"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } /// Terminate the auction associated with the specified `auction_id` @@ -271,11 +247,9 @@ pub struct ActionDutchAuctionEnd { } impl ::prost::Name for ActionDutchAuctionEnd { const NAME: &'static str = "ActionDutchAuctionEnd"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } /// Withdraw funds from the ended auction associated with the specified `auction_id` @@ -300,11 +274,9 @@ pub struct ActionDutchAuctionWithdraw { } impl ::prost::Name for ActionDutchAuctionWithdraw { const NAME: &'static str = "ActionDutchAuctionWithdraw"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } /// A plan to a `ActionDutchAuctionWithdraw` which contains both private and public data. @@ -322,11 +294,9 @@ pub struct ActionDutchAuctionWithdrawPlan { } impl ::prost::Name for ActionDutchAuctionWithdrawPlan { const NAME: &'static str = "ActionDutchAuctionWithdrawPlan"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } /// An `ActionDutchAuctionSchedule` augmented with additional metadata. @@ -346,11 +316,9 @@ pub struct ActionDutchAuctionScheduleView { } impl ::prost::Name for ActionDutchAuctionScheduleView { const NAME: &'static str = "ActionDutchAuctionScheduleView"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } /// An `ActionDutchAuctionWithdraw` augmented with additional metadata. @@ -366,11 +334,9 @@ pub struct ActionDutchAuctionWithdrawView { } impl ::prost::Name for ActionDutchAuctionWithdrawView { const NAME: &'static str = "ActionDutchAuctionWithdrawView"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -383,11 +349,9 @@ pub struct EventDutchAuctionScheduled { } impl ::prost::Name for EventDutchAuctionScheduled { const NAME: &'static str = "EventDutchAuctionScheduled"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -400,11 +364,9 @@ pub struct EventDutchAuctionUpdated { } impl ::prost::Name for EventDutchAuctionUpdated { const NAME: &'static str = "EventDutchAuctionUpdated"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -468,11 +430,9 @@ pub mod event_dutch_auction_ended { } impl ::prost::Name for EventDutchAuctionEnded { const NAME: &'static str = "EventDutchAuctionEnded"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } /// A message emitted when value flows *into* the auction component. @@ -491,11 +451,9 @@ pub struct EventValueCircuitBreakerCredit { } impl ::prost::Name for EventValueCircuitBreakerCredit { const NAME: &'static str = "EventValueCircuitBreakerCredit"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } /// A message emitted when value flows *out* of the auction component. @@ -514,11 +472,9 @@ pub struct EventValueCircuitBreakerDebit { } impl ::prost::Name for EventValueCircuitBreakerDebit { const NAME: &'static str = "EventValueCircuitBreakerDebit"; - const PACKAGE: &'static str = "penumbra.core.component.auction.v1alpha1"; + const PACKAGE: &'static str = "penumbra.core.component.auction.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!( - "penumbra.core.component.auction.v1alpha1.{}", Self::NAME - ) + ::prost::alloc::format!("penumbra.core.component.auction.v1.{}", Self::NAME) } } /// Generated client implementations. @@ -627,13 +583,13 @@ pub mod query_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/penumbra.core.component.auction.v1alpha1.QueryService/AuctionStateById", + "/penumbra.core.component.auction.v1.QueryService/AuctionStateById", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "penumbra.core.component.auction.v1alpha1.QueryService", + "penumbra.core.component.auction.v1.QueryService", "AuctionStateById", ), ); @@ -658,13 +614,13 @@ pub mod query_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/penumbra.core.component.auction.v1alpha1.QueryService/AuctionStateByIds", + "/penumbra.core.component.auction.v1.QueryService/AuctionStateByIds", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "penumbra.core.component.auction.v1alpha1.QueryService", + "penumbra.core.component.auction.v1.QueryService", "AuctionStateByIds", ), ); @@ -786,7 +742,7 @@ pub mod query_service_server { fn call(&mut self, req: http::Request) -> Self::Future { let inner = self.inner.clone(); match req.uri().path() { - "/penumbra.core.component.auction.v1alpha1.QueryService/AuctionStateById" => { + "/penumbra.core.component.auction.v1.QueryService/AuctionStateById" => { #[allow(non_camel_case_types)] struct AuctionStateByIdSvc(pub Arc); impl< @@ -833,7 +789,7 @@ pub mod query_service_server { }; Box::pin(fut) } - "/penumbra.core.component.auction.v1alpha1.QueryService/AuctionStateByIds" => { + "/penumbra.core.component.auction.v1.QueryService/AuctionStateByIds" => { #[allow(non_camel_case_types)] struct AuctionStateByIdsSvc(pub Arc); impl< @@ -920,6 +876,6 @@ pub mod query_service_server { } } impl tonic::server::NamedService for QueryServiceServer { - const NAME: &'static str = "penumbra.core.component.auction.v1alpha1.QueryService"; + const NAME: &'static str = "penumbra.core.component.auction.v1.QueryService"; } } diff --git a/crates/proto/src/gen/penumbra.core.component.auction.v1alpha1.serde.rs b/crates/proto/src/gen/penumbra.core.component.auction.v1.serde.rs similarity index 96% rename from crates/proto/src/gen/penumbra.core.component.auction.v1alpha1.serde.rs rename to crates/proto/src/gen/penumbra.core.component.auction.v1.serde.rs index d495800b26..a4267c54cc 100644 --- a/crates/proto/src/gen/penumbra.core.component.auction.v1alpha1.serde.rs +++ b/crates/proto/src/gen/penumbra.core.component.auction.v1.serde.rs @@ -9,7 +9,7 @@ impl serde::Serialize for ActionDutchAuctionEnd { if self.auction_id.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.ActionDutchAuctionEnd", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.ActionDutchAuctionEnd", len)?; if let Some(v) = self.auction_id.as_ref() { struct_ser.serialize_field("auctionId", v)?; } @@ -65,7 +65,7 @@ impl<'de> serde::Deserialize<'de> for ActionDutchAuctionEnd { type Value = ActionDutchAuctionEnd; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.ActionDutchAuctionEnd") + formatter.write_str("struct penumbra.core.component.auction.v1.ActionDutchAuctionEnd") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -91,7 +91,7 @@ impl<'de> serde::Deserialize<'de> for ActionDutchAuctionEnd { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.ActionDutchAuctionEnd", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.ActionDutchAuctionEnd", FIELDS, GeneratedVisitor) } } impl serde::Serialize for ActionDutchAuctionSchedule { @@ -105,7 +105,7 @@ impl serde::Serialize for ActionDutchAuctionSchedule { if self.description.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.ActionDutchAuctionSchedule", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.ActionDutchAuctionSchedule", len)?; if let Some(v) = self.description.as_ref() { struct_ser.serialize_field("description", v)?; } @@ -160,7 +160,7 @@ impl<'de> serde::Deserialize<'de> for ActionDutchAuctionSchedule { type Value = ActionDutchAuctionSchedule; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.ActionDutchAuctionSchedule") + formatter.write_str("struct penumbra.core.component.auction.v1.ActionDutchAuctionSchedule") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -186,7 +186,7 @@ impl<'de> serde::Deserialize<'de> for ActionDutchAuctionSchedule { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.ActionDutchAuctionSchedule", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.ActionDutchAuctionSchedule", FIELDS, GeneratedVisitor) } } impl serde::Serialize for ActionDutchAuctionScheduleView { @@ -209,7 +209,7 @@ impl serde::Serialize for ActionDutchAuctionScheduleView { if self.output_metadata.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.ActionDutchAuctionScheduleView", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.ActionDutchAuctionScheduleView", len)?; if let Some(v) = self.action.as_ref() { struct_ser.serialize_field("action", v)?; } @@ -285,7 +285,7 @@ impl<'de> serde::Deserialize<'de> for ActionDutchAuctionScheduleView { type Value = ActionDutchAuctionScheduleView; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.ActionDutchAuctionScheduleView") + formatter.write_str("struct penumbra.core.component.auction.v1.ActionDutchAuctionScheduleView") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -335,7 +335,7 @@ impl<'de> serde::Deserialize<'de> for ActionDutchAuctionScheduleView { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.ActionDutchAuctionScheduleView", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.ActionDutchAuctionScheduleView", FIELDS, GeneratedVisitor) } } impl serde::Serialize for ActionDutchAuctionWithdraw { @@ -355,7 +355,7 @@ impl serde::Serialize for ActionDutchAuctionWithdraw { if self.reserves_commitment.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.ActionDutchAuctionWithdraw", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.ActionDutchAuctionWithdraw", len)?; if let Some(v) = self.auction_id.as_ref() { struct_ser.serialize_field("auctionId", v)?; } @@ -425,7 +425,7 @@ impl<'de> serde::Deserialize<'de> for ActionDutchAuctionWithdraw { type Value = ActionDutchAuctionWithdraw; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.ActionDutchAuctionWithdraw") + formatter.write_str("struct penumbra.core.component.auction.v1.ActionDutchAuctionWithdraw") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -469,7 +469,7 @@ impl<'de> serde::Deserialize<'de> for ActionDutchAuctionWithdraw { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.ActionDutchAuctionWithdraw", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.ActionDutchAuctionWithdraw", FIELDS, GeneratedVisitor) } } impl serde::Serialize for ActionDutchAuctionWithdrawPlan { @@ -492,7 +492,7 @@ impl serde::Serialize for ActionDutchAuctionWithdrawPlan { if self.reserves_output.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.ActionDutchAuctionWithdrawPlan", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.ActionDutchAuctionWithdrawPlan", len)?; if let Some(v) = self.auction_id.as_ref() { struct_ser.serialize_field("auctionId", v)?; } @@ -569,7 +569,7 @@ impl<'de> serde::Deserialize<'de> for ActionDutchAuctionWithdrawPlan { type Value = ActionDutchAuctionWithdrawPlan; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.ActionDutchAuctionWithdrawPlan") + formatter.write_str("struct penumbra.core.component.auction.v1.ActionDutchAuctionWithdrawPlan") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -621,7 +621,7 @@ impl<'de> serde::Deserialize<'de> for ActionDutchAuctionWithdrawPlan { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.ActionDutchAuctionWithdrawPlan", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.ActionDutchAuctionWithdrawPlan", FIELDS, GeneratedVisitor) } } impl serde::Serialize for ActionDutchAuctionWithdrawView { @@ -638,7 +638,7 @@ impl serde::Serialize for ActionDutchAuctionWithdrawView { if !self.reserves.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.ActionDutchAuctionWithdrawView", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.ActionDutchAuctionWithdrawView", len)?; if let Some(v) = self.action.as_ref() { struct_ser.serialize_field("action", v)?; } @@ -699,7 +699,7 @@ impl<'de> serde::Deserialize<'de> for ActionDutchAuctionWithdrawView { type Value = ActionDutchAuctionWithdrawView; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.ActionDutchAuctionWithdrawView") + formatter.write_str("struct penumbra.core.component.auction.v1.ActionDutchAuctionWithdrawView") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -733,7 +733,7 @@ impl<'de> serde::Deserialize<'de> for ActionDutchAuctionWithdrawView { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.ActionDutchAuctionWithdrawView", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.ActionDutchAuctionWithdrawView", FIELDS, GeneratedVisitor) } } impl serde::Serialize for AuctionId { @@ -747,7 +747,7 @@ impl serde::Serialize for AuctionId { if !self.inner.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.AuctionId", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.AuctionId", len)?; if !self.inner.is_empty() { #[allow(clippy::needless_borrow)] struct_ser.serialize_field("inner", pbjson::private::base64::encode(&self.inner).as_str())?; @@ -803,7 +803,7 @@ impl<'de> serde::Deserialize<'de> for AuctionId { type Value = AuctionId; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.AuctionId") + formatter.write_str("struct penumbra.core.component.auction.v1.AuctionId") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -831,7 +831,7 @@ impl<'de> serde::Deserialize<'de> for AuctionId { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.AuctionId", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.AuctionId", FIELDS, GeneratedVisitor) } } impl serde::Serialize for AuctionNft { @@ -848,7 +848,7 @@ impl serde::Serialize for AuctionNft { if self.seq != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.AuctionNft", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.AuctionNft", len)?; if let Some(v) = self.id.as_ref() { struct_ser.serialize_field("id", v)?; } @@ -910,7 +910,7 @@ impl<'de> serde::Deserialize<'de> for AuctionNft { type Value = AuctionNft; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.AuctionNft") + formatter.write_str("struct penumbra.core.component.auction.v1.AuctionNft") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -946,7 +946,7 @@ impl<'de> serde::Deserialize<'de> for AuctionNft { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.AuctionNft", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.AuctionNft", FIELDS, GeneratedVisitor) } } impl serde::Serialize for AuctionParameters { @@ -957,7 +957,7 @@ impl serde::Serialize for AuctionParameters { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.AuctionParameters", len)?; + let struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.AuctionParameters", len)?; struct_ser.end() } } @@ -1004,7 +1004,7 @@ impl<'de> serde::Deserialize<'de> for AuctionParameters { type Value = AuctionParameters; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.AuctionParameters") + formatter.write_str("struct penumbra.core.component.auction.v1.AuctionParameters") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1018,7 +1018,7 @@ impl<'de> serde::Deserialize<'de> for AuctionParameters { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.AuctionParameters", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.AuctionParameters", FIELDS, GeneratedVisitor) } } impl serde::Serialize for AuctionStateByIdRequest { @@ -1032,7 +1032,7 @@ impl serde::Serialize for AuctionStateByIdRequest { if self.id.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.AuctionStateByIdRequest", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.AuctionStateByIdRequest", len)?; if let Some(v) = self.id.as_ref() { struct_ser.serialize_field("id", v)?; } @@ -1087,7 +1087,7 @@ impl<'de> serde::Deserialize<'de> for AuctionStateByIdRequest { type Value = AuctionStateByIdRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.AuctionStateByIdRequest") + formatter.write_str("struct penumbra.core.component.auction.v1.AuctionStateByIdRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1113,7 +1113,7 @@ impl<'de> serde::Deserialize<'de> for AuctionStateByIdRequest { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.AuctionStateByIdRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.AuctionStateByIdRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for AuctionStateByIdResponse { @@ -1130,7 +1130,7 @@ impl serde::Serialize for AuctionStateByIdResponse { if !self.positions.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.AuctionStateByIdResponse", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.AuctionStateByIdResponse", len)?; if let Some(v) = self.auction.as_ref() { struct_ser.serialize_field("auction", v)?; } @@ -1191,7 +1191,7 @@ impl<'de> serde::Deserialize<'de> for AuctionStateByIdResponse { type Value = AuctionStateByIdResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.AuctionStateByIdResponse") + formatter.write_str("struct penumbra.core.component.auction.v1.AuctionStateByIdResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1225,7 +1225,7 @@ impl<'de> serde::Deserialize<'de> for AuctionStateByIdResponse { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.AuctionStateByIdResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.AuctionStateByIdResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for AuctionStateByIdsRequest { @@ -1239,7 +1239,7 @@ impl serde::Serialize for AuctionStateByIdsRequest { if !self.id.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.AuctionStateByIdsRequest", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.AuctionStateByIdsRequest", len)?; if !self.id.is_empty() { struct_ser.serialize_field("id", &self.id)?; } @@ -1294,7 +1294,7 @@ impl<'de> serde::Deserialize<'de> for AuctionStateByIdsRequest { type Value = AuctionStateByIdsRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.AuctionStateByIdsRequest") + formatter.write_str("struct penumbra.core.component.auction.v1.AuctionStateByIdsRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1320,7 +1320,7 @@ impl<'de> serde::Deserialize<'de> for AuctionStateByIdsRequest { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.AuctionStateByIdsRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.AuctionStateByIdsRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for AuctionStateByIdsResponse { @@ -1340,7 +1340,7 @@ impl serde::Serialize for AuctionStateByIdsResponse { if !self.positions.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.AuctionStateByIdsResponse", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.AuctionStateByIdsResponse", len)?; if let Some(v) = self.id.as_ref() { struct_ser.serialize_field("id", v)?; } @@ -1407,7 +1407,7 @@ impl<'de> serde::Deserialize<'de> for AuctionStateByIdsResponse { type Value = AuctionStateByIdsResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.AuctionStateByIdsResponse") + formatter.write_str("struct penumbra.core.component.auction.v1.AuctionStateByIdsResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1449,7 +1449,7 @@ impl<'de> serde::Deserialize<'de> for AuctionStateByIdsResponse { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.AuctionStateByIdsResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.AuctionStateByIdsResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for DutchAuction { @@ -1466,7 +1466,7 @@ impl serde::Serialize for DutchAuction { if self.state.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.DutchAuction", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.DutchAuction", len)?; if let Some(v) = self.description.as_ref() { struct_ser.serialize_field("description", v)?; } @@ -1527,7 +1527,7 @@ impl<'de> serde::Deserialize<'de> for DutchAuction { type Value = DutchAuction; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.DutchAuction") + formatter.write_str("struct penumbra.core.component.auction.v1.DutchAuction") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1561,7 +1561,7 @@ impl<'de> serde::Deserialize<'de> for DutchAuction { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.DutchAuction", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.DutchAuction", FIELDS, GeneratedVisitor) } } impl serde::Serialize for DutchAuctionDescription { @@ -1596,7 +1596,7 @@ impl serde::Serialize for DutchAuctionDescription { if !self.nonce.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.DutchAuctionDescription", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.DutchAuctionDescription", len)?; if let Some(v) = self.input.as_ref() { struct_ser.serialize_field("input", v)?; } @@ -1703,7 +1703,7 @@ impl<'de> serde::Deserialize<'de> for DutchAuctionDescription { type Value = DutchAuctionDescription; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.DutchAuctionDescription") + formatter.write_str("struct penumbra.core.component.auction.v1.DutchAuctionDescription") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1793,7 +1793,7 @@ impl<'de> serde::Deserialize<'de> for DutchAuctionDescription { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.DutchAuctionDescription", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.DutchAuctionDescription", FIELDS, GeneratedVisitor) } } impl serde::Serialize for DutchAuctionState { @@ -1819,7 +1819,7 @@ impl serde::Serialize for DutchAuctionState { if self.output_reserves.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.DutchAuctionState", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.DutchAuctionState", len)?; if self.seq != 0 { #[allow(clippy::needless_borrow)] struct_ser.serialize_field("seq", ToString::to_string(&self.seq).as_str())?; @@ -1904,7 +1904,7 @@ impl<'de> serde::Deserialize<'de> for DutchAuctionState { type Value = DutchAuctionState; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.DutchAuctionState") + formatter.write_str("struct penumbra.core.component.auction.v1.DutchAuctionState") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1966,7 +1966,7 @@ impl<'de> serde::Deserialize<'de> for DutchAuctionState { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.DutchAuctionState", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.DutchAuctionState", FIELDS, GeneratedVisitor) } } impl serde::Serialize for EventDutchAuctionEnded { @@ -1986,7 +1986,7 @@ impl serde::Serialize for EventDutchAuctionEnded { if self.reason != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.EventDutchAuctionEnded", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.EventDutchAuctionEnded", len)?; if let Some(v) = self.auction_id.as_ref() { struct_ser.serialize_field("auctionId", v)?; } @@ -2056,7 +2056,7 @@ impl<'de> serde::Deserialize<'de> for EventDutchAuctionEnded { type Value = EventDutchAuctionEnded; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.EventDutchAuctionEnded") + formatter.write_str("struct penumbra.core.component.auction.v1.EventDutchAuctionEnded") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -2098,7 +2098,7 @@ impl<'de> serde::Deserialize<'de> for EventDutchAuctionEnded { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.EventDutchAuctionEnded", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.EventDutchAuctionEnded", FIELDS, GeneratedVisitor) } } impl serde::Serialize for event_dutch_auction_ended::Reason { @@ -2192,7 +2192,7 @@ impl serde::Serialize for EventDutchAuctionScheduled { if self.description.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.EventDutchAuctionScheduled", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.EventDutchAuctionScheduled", len)?; if let Some(v) = self.auction_id.as_ref() { struct_ser.serialize_field("auctionId", v)?; } @@ -2254,7 +2254,7 @@ impl<'de> serde::Deserialize<'de> for EventDutchAuctionScheduled { type Value = EventDutchAuctionScheduled; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.EventDutchAuctionScheduled") + formatter.write_str("struct penumbra.core.component.auction.v1.EventDutchAuctionScheduled") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -2288,7 +2288,7 @@ impl<'de> serde::Deserialize<'de> for EventDutchAuctionScheduled { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.EventDutchAuctionScheduled", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.EventDutchAuctionScheduled", FIELDS, GeneratedVisitor) } } impl serde::Serialize for EventDutchAuctionUpdated { @@ -2305,7 +2305,7 @@ impl serde::Serialize for EventDutchAuctionUpdated { if self.state.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.EventDutchAuctionUpdated", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.EventDutchAuctionUpdated", len)?; if let Some(v) = self.auction_id.as_ref() { struct_ser.serialize_field("auctionId", v)?; } @@ -2367,7 +2367,7 @@ impl<'de> serde::Deserialize<'de> for EventDutchAuctionUpdated { type Value = EventDutchAuctionUpdated; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.EventDutchAuctionUpdated") + formatter.write_str("struct penumbra.core.component.auction.v1.EventDutchAuctionUpdated") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -2401,7 +2401,7 @@ impl<'de> serde::Deserialize<'de> for EventDutchAuctionUpdated { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.EventDutchAuctionUpdated", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.EventDutchAuctionUpdated", FIELDS, GeneratedVisitor) } } impl serde::Serialize for EventValueCircuitBreakerCredit { @@ -2421,7 +2421,7 @@ impl serde::Serialize for EventValueCircuitBreakerCredit { if self.new_balance.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.EventValueCircuitBreakerCredit", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.EventValueCircuitBreakerCredit", len)?; if let Some(v) = self.asset_id.as_ref() { struct_ser.serialize_field("assetId", v)?; } @@ -2491,7 +2491,7 @@ impl<'de> serde::Deserialize<'de> for EventValueCircuitBreakerCredit { type Value = EventValueCircuitBreakerCredit; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.EventValueCircuitBreakerCredit") + formatter.write_str("struct penumbra.core.component.auction.v1.EventValueCircuitBreakerCredit") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -2533,7 +2533,7 @@ impl<'de> serde::Deserialize<'de> for EventValueCircuitBreakerCredit { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.EventValueCircuitBreakerCredit", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.EventValueCircuitBreakerCredit", FIELDS, GeneratedVisitor) } } impl serde::Serialize for EventValueCircuitBreakerDebit { @@ -2553,7 +2553,7 @@ impl serde::Serialize for EventValueCircuitBreakerDebit { if self.new_balance.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.EventValueCircuitBreakerDebit", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.EventValueCircuitBreakerDebit", len)?; if let Some(v) = self.asset_id.as_ref() { struct_ser.serialize_field("assetId", v)?; } @@ -2623,7 +2623,7 @@ impl<'de> serde::Deserialize<'de> for EventValueCircuitBreakerDebit { type Value = EventValueCircuitBreakerDebit; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.EventValueCircuitBreakerDebit") + formatter.write_str("struct penumbra.core.component.auction.v1.EventValueCircuitBreakerDebit") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -2665,7 +2665,7 @@ impl<'de> serde::Deserialize<'de> for EventValueCircuitBreakerDebit { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.EventValueCircuitBreakerDebit", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.EventValueCircuitBreakerDebit", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GenesisContent { @@ -2679,7 +2679,7 @@ impl serde::Serialize for GenesisContent { if self.params.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1alpha1.GenesisContent", len)?; + let mut struct_ser = serializer.serialize_struct("penumbra.core.component.auction.v1.GenesisContent", len)?; if let Some(v) = self.params.as_ref() { struct_ser.serialize_field("params", v)?; } @@ -2734,7 +2734,7 @@ impl<'de> serde::Deserialize<'de> for GenesisContent { type Value = GenesisContent; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct penumbra.core.component.auction.v1alpha1.GenesisContent") + formatter.write_str("struct penumbra.core.component.auction.v1.GenesisContent") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -2760,6 +2760,6 @@ impl<'de> serde::Deserialize<'de> for GenesisContent { }) } } - deserializer.deserialize_struct("penumbra.core.component.auction.v1alpha1.GenesisContent", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("penumbra.core.component.auction.v1.GenesisContent", FIELDS, GeneratedVisitor) } } 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 baa430de29..1fc038fd14 100644 --- a/crates/proto/src/gen/penumbra.core.component.governance.v1.rs +++ b/crates/proto/src/gen/penumbra.core.component.governance.v1.rs @@ -1083,7 +1083,7 @@ pub struct ChangedAppParameters { /// Auction module parameters. #[prost(message, optional, tag = "11")] pub auction_params: ::core::option::Option< - super::super::auction::v1alpha1::AuctionParameters, + super::super::auction::v1::AuctionParameters, >, } impl ::prost::Name for ChangedAppParameters { diff --git a/crates/proto/src/gen/penumbra.core.transaction.v1.rs b/crates/proto/src/gen/penumbra.core.transaction.v1.rs index 5cab6232f1..86a0bd2dc7 100644 --- a/crates/proto/src/gen/penumbra.core.transaction.v1.rs +++ b/crates/proto/src/gen/penumbra.core.transaction.v1.rs @@ -167,15 +167,15 @@ pub mod action { /// Dutch auctions #[prost(message, tag = "53")] ActionDutchAuctionSchedule( - super::super::super::component::auction::v1alpha1::ActionDutchAuctionSchedule, + super::super::super::component::auction::v1::ActionDutchAuctionSchedule, ), #[prost(message, tag = "54")] ActionDutchAuctionEnd( - super::super::super::component::auction::v1alpha1::ActionDutchAuctionEnd, + super::super::super::component::auction::v1::ActionDutchAuctionEnd, ), #[prost(message, tag = "55")] ActionDutchAuctionWithdraw( - super::super::super::component::auction::v1alpha1::ActionDutchAuctionWithdraw, + super::super::super::component::auction::v1::ActionDutchAuctionWithdraw, ), #[prost(message, tag = "200")] Ics20Withdrawal(super::super::super::component::ibc::v1::Ics20Withdrawal), @@ -470,15 +470,15 @@ pub mod action_view { /// Dutch auctions #[prost(message, tag = "53")] ActionDutchAuctionSchedule( - super::super::super::component::auction::v1alpha1::ActionDutchAuctionScheduleView, + super::super::super::component::auction::v1::ActionDutchAuctionScheduleView, ), #[prost(message, tag = "54")] ActionDutchAuctionEnd( - super::super::super::component::auction::v1alpha1::ActionDutchAuctionEnd, + super::super::super::component::auction::v1::ActionDutchAuctionEnd, ), #[prost(message, tag = "55")] ActionDutchAuctionWithdraw( - super::super::super::component::auction::v1alpha1::ActionDutchAuctionWithdrawView, + super::super::super::component::auction::v1::ActionDutchAuctionWithdrawView, ), /// TODO: we have no way to recover the opening of the undelegate_claim's /// balance commitment, and can only infer the value from looking at the rest @@ -673,15 +673,15 @@ pub mod action_plan { /// Dutch auctions #[prost(message, tag = "53")] ActionDutchAuctionSchedule( - super::super::super::component::auction::v1alpha1::ActionDutchAuctionSchedule, + super::super::super::component::auction::v1::ActionDutchAuctionSchedule, ), #[prost(message, tag = "54")] ActionDutchAuctionEnd( - super::super::super::component::auction::v1alpha1::ActionDutchAuctionEnd, + super::super::super::component::auction::v1::ActionDutchAuctionEnd, ), #[prost(message, tag = "55")] ActionDutchAuctionWithdraw( - super::super::super::component::auction::v1alpha1::ActionDutchAuctionWithdrawPlan, + super::super::super::component::auction::v1::ActionDutchAuctionWithdrawPlan, ), } } diff --git a/crates/proto/src/gen/penumbra.view.v1.rs b/crates/proto/src/gen/penumbra.view.v1.rs index 1591406240..345079773d 100644 --- a/crates/proto/src/gen/penumbra.view.v1.rs +++ b/crates/proto/src/gen/penumbra.view.v1.rs @@ -25,7 +25,7 @@ impl ::prost::Name for AuctionsRequest { pub struct AuctionsResponse { #[prost(message, optional, tag = "1")] pub id: ::core::option::Option< - super::super::core::component::auction::v1alpha1::AuctionId, + super::super::core::component::auction::v1::AuctionId, >, /// The note recording the auction NFT. #[prost(message, optional, tag = "4")] @@ -507,7 +507,7 @@ pub mod transaction_planner_request { /// The description of the auction to schedule. #[prost(message, optional, tag = "1")] pub description: ::core::option::Option< - super::super::super::core::component::auction::v1alpha1::DutchAuctionDescription, + super::super::super::core::component::auction::v1::DutchAuctionDescription, >, } impl ::prost::Name for ActionDutchAuctionSchedule { @@ -525,7 +525,7 @@ pub mod transaction_planner_request { /// The unique id of the auction to close. #[prost(message, optional, tag = "1")] pub auction_id: ::core::option::Option< - super::super::super::core::component::auction::v1alpha1::AuctionId, + super::super::super::core::component::auction::v1::AuctionId, >, } impl ::prost::Name for ActionDutchAuctionEnd { @@ -543,7 +543,7 @@ pub mod transaction_planner_request { /// The auction to withdraw funds from. #[prost(message, optional, tag = "1")] pub auction_id: ::core::option::Option< - super::super::super::core::component::auction::v1alpha1::AuctionId, + super::super::super::core::component::auction::v1::AuctionId, >, /// The sequence number of the withdrawal. #[prost(uint64, tag = "2")] diff --git a/crates/proto/src/gen/proto_descriptor.bin.no_lfs b/crates/proto/src/gen/proto_descriptor.bin.no_lfs index 91d3694fa1..7e96332910 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/crates/proto/src/lib.rs b/crates/proto/src/lib.rs index 4268d190ed..42bd785867 100644 --- a/crates/proto/src/lib.rs +++ b/crates/proto/src/lib.rs @@ -73,9 +73,9 @@ pub mod penumbra { /// Components of the Penumbra application. pub mod component { pub mod auction { - pub mod v1alpha1 { - include!("gen/penumbra.core.component.auction.v1alpha1.rs"); - include!("gen/penumbra.core.component.auction.v1alpha1.serde.rs"); + pub mod v1 { + include!("gen/penumbra.core.component.auction.v1.rs"); + include!("gen/penumbra.core.component.auction.v1.serde.rs"); } } pub mod compact_block { diff --git a/crates/view/src/service.rs b/crates/view/src/service.rs index 90e47504e5..9d2c8c5e38 100644 --- a/crates/view/src/service.rs +++ b/crates/view/src/service.rs @@ -412,8 +412,8 @@ impl ViewService for ViewServer { &self, request: tonic::Request, ) -> Result, tonic::Status> { - use penumbra_proto::core::component::auction::v1alpha1 as pb_auction; - use penumbra_proto::core::component::auction::v1alpha1::query_service_client::QueryServiceClient as AuctionQueryServiceClient; + use penumbra_proto::core::component::auction::v1 as pb_auction; + use penumbra_proto::core::component::auction::v1::query_service_client::QueryServiceClient as AuctionQueryServiceClient; let parameters = request.into_inner(); let query_latest_state = parameters.query_latest_state; diff --git a/docs/protocol/src/transactions/actions.md b/docs/protocol/src/transactions/actions.md index 7958ecc95c..6735819d26 100644 --- a/docs/protocol/src/transactions/actions.md +++ b/docs/protocol/src/transactions/actions.md @@ -47,6 +47,6 @@ contributions together. | `governance.v1.CommunityPoolSpend` | Spends funds from the community pool | | $+$ (spent value) | | `governance.v1.CommunityPoolOutput` | Like `Output`, but transparent | | $-$ (value of new note) | | `governance.v1.CommunityPoolDeposit` | Allows deposits into the community pool | | $-$ (value of deposit) | -| `auction.v1alpha1.ActionDutchAuctionSchedule` | Schedule a Dutch auction | | $-$ (initial reserves) $+$ (opened auction NFT) | -| `auction.v1alpha1.ActionDutchAuctionEnd` | Terminate a Dutch auction | | $-$ (opened auction NFT) $+$ (closed auction NFT) | -| `auction.v1alpha1.ActionDutchAuctionWithdraw` | Withdraw a Dutch auction, with a sequence number $n$ | | $-$ (closed/withdrawn auction nft with sequence $n-1$) $+$ (withdrawn auction NFT with sequence $n$) $+$ (auction reserves) | +| `auction.v1.ActionDutchAuctionSchedule` | Schedule a Dutch auction | | $-$ (initial reserves) $+$ (opened auction NFT) | +| `auction.v1.ActionDutchAuctionEnd` | Terminate a Dutch auction | | $-$ (opened auction NFT) $+$ (closed auction NFT) | +| `auction.v1.ActionDutchAuctionWithdraw` | Withdraw a Dutch auction, with a sequence number $n$ | | $-$ (closed/withdrawn auction nft with sequence $n-1$) $+$ (withdrawn auction NFT with sequence $n$) $+$ (auction reserves) | diff --git a/proto/penumbra/penumbra/core/app/v1/app.proto b/proto/penumbra/penumbra/core/app/v1/app.proto index 32f51d495f..7d9f1a99de 100644 --- a/proto/penumbra/penumbra/core/app/v1/app.proto +++ b/proto/penumbra/penumbra/core/app/v1/app.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package penumbra.core.app.v1; -import "penumbra/core/component/auction/v1alpha1/auction.proto"; +import "penumbra/core/component/auction/v1/auction.proto"; import "penumbra/core/component/community_pool/v1/community_pool.proto"; import "penumbra/core/component/dex/v1/dex.proto"; import "penumbra/core/component/distributions/v1/distributions.proto"; @@ -60,7 +60,7 @@ message AppParameters { // DEX module parameters. core.component.dex.v1.DexParameters dex_params = 11; // Auction module parameters. - core.component.auction.v1alpha1.AuctionParameters auction_params = 12; + core.component.auction.v1.AuctionParameters auction_params = 12; } // Requests the global configuration data for the app. @@ -101,5 +101,5 @@ message GenesisContent { // DEX component genesis state. core.component.dex.v1.GenesisContent dex_content = 11; // Auction component genesis state. - core.component.auction.v1alpha1.GenesisContent auction_content = 12; + core.component.auction.v1.GenesisContent auction_content = 12; } diff --git a/proto/penumbra/penumbra/core/component/auction/v1alpha1/auction.proto b/proto/penumbra/penumbra/core/component/auction/v1/auction.proto similarity index 99% rename from proto/penumbra/penumbra/core/component/auction/v1alpha1/auction.proto rename to proto/penumbra/penumbra/core/component/auction/v1/auction.proto index f93720a898..e3bce44ede 100755 --- a/proto/penumbra/penumbra/core/component/auction/v1alpha1/auction.proto +++ b/proto/penumbra/penumbra/core/component/auction/v1/auction.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package penumbra.core.component.auction.v1alpha1; +package penumbra.core.component.auction.v1; import "google/protobuf/any.proto"; import "penumbra/core/asset/v1/asset.proto"; diff --git a/proto/penumbra/penumbra/core/component/governance/v1/governance.proto b/proto/penumbra/penumbra/core/component/governance/v1/governance.proto index fb88a6cedd..e0fb706de8 100644 --- a/proto/penumbra/penumbra/core/component/governance/v1/governance.proto +++ b/proto/penumbra/penumbra/core/component/governance/v1/governance.proto @@ -3,7 +3,7 @@ package penumbra.core.component.governance.v1; import "google/protobuf/any.proto"; import "penumbra/core/asset/v1/asset.proto"; -import "penumbra/core/component/auction/v1alpha1/auction.proto"; +import "penumbra/core/component/auction/v1/auction.proto"; import "penumbra/core/component/community_pool/v1/community_pool.proto"; import "penumbra/core/component/dex/v1/dex.proto"; import "penumbra/core/component/distributions/v1/distributions.proto"; @@ -475,7 +475,7 @@ message ChangedAppParameters { // DEX component parameters core.component.dex.v1.DexParameters dex_params = 10; // Auction module parameters. - core.component.auction.v1alpha1.AuctionParameters auction_params = 11; + core.component.auction.v1.AuctionParameters auction_params = 11; } // DEPRECATED diff --git a/proto/penumbra/penumbra/core/transaction/v1/transaction.proto b/proto/penumbra/penumbra/core/transaction/v1/transaction.proto index 1e0564ead0..b676cf1829 100644 --- a/proto/penumbra/penumbra/core/transaction/v1/transaction.proto +++ b/proto/penumbra/penumbra/core/transaction/v1/transaction.proto @@ -3,7 +3,7 @@ package penumbra.core.transaction.v1; import "google/protobuf/any.proto"; import "penumbra/core/asset/v1/asset.proto"; -import "penumbra/core/component/auction/v1alpha1/auction.proto"; +import "penumbra/core/component/auction/v1/auction.proto"; import "penumbra/core/component/dex/v1/dex.proto"; import "penumbra/core/component/fee/v1/fee.proto"; import "penumbra/core/component/governance/v1/governance.proto"; @@ -98,9 +98,9 @@ message Action { component.governance.v1.CommunityPoolDeposit community_pool_deposit = 52; // Dutch auctions - component.auction.v1alpha1.ActionDutchAuctionSchedule action_dutch_auction_schedule = 53; - component.auction.v1alpha1.ActionDutchAuctionEnd action_dutch_auction_end = 54; - component.auction.v1alpha1.ActionDutchAuctionWithdraw action_dutch_auction_withdraw = 55; + component.auction.v1.ActionDutchAuctionSchedule action_dutch_auction_schedule = 53; + component.auction.v1.ActionDutchAuctionEnd action_dutch_auction_end = 54; + component.auction.v1.ActionDutchAuctionWithdraw action_dutch_auction_withdraw = 55; component.ibc.v1.Ics20Withdrawal ics20_withdrawal = 200; } @@ -223,9 +223,9 @@ message ActionView { component.governance.v1.CommunityPoolOutput community_pool_output = 51; component.governance.v1.CommunityPoolDeposit community_pool_deposit = 52; // Dutch auctions - component.auction.v1alpha1.ActionDutchAuctionScheduleView action_dutch_auction_schedule = 53; - component.auction.v1alpha1.ActionDutchAuctionEnd action_dutch_auction_end = 54; - component.auction.v1alpha1.ActionDutchAuctionWithdrawView action_dutch_auction_withdraw = 55; + component.auction.v1.ActionDutchAuctionScheduleView action_dutch_auction_schedule = 53; + component.auction.v1.ActionDutchAuctionEnd action_dutch_auction_end = 54; + component.auction.v1.ActionDutchAuctionWithdrawView action_dutch_auction_withdraw = 55; // TODO: we have no way to recover the opening of the undelegate_claim's // balance commitment, and can only infer the value from looking at the rest @@ -321,9 +321,9 @@ message ActionPlan { component.governance.v1.CommunityPoolDeposit community_pool_deposit = 52; // Dutch auctions - component.auction.v1alpha1.ActionDutchAuctionSchedule action_dutch_auction_schedule = 53; - component.auction.v1alpha1.ActionDutchAuctionEnd action_dutch_auction_end = 54; - component.auction.v1alpha1.ActionDutchAuctionWithdrawPlan action_dutch_auction_withdraw = 55; + component.auction.v1.ActionDutchAuctionSchedule action_dutch_auction_schedule = 53; + component.auction.v1.ActionDutchAuctionEnd action_dutch_auction_end = 54; + component.auction.v1.ActionDutchAuctionWithdrawPlan action_dutch_auction_withdraw = 55; } } diff --git a/proto/penumbra/penumbra/view/v1/view.proto b/proto/penumbra/penumbra/view/v1/view.proto index 76aeaea5b2..191512ed3b 100644 --- a/proto/penumbra/penumbra/view/v1/view.proto +++ b/proto/penumbra/penumbra/view/v1/view.proto @@ -5,7 +5,7 @@ package penumbra.view.v1; import "google/protobuf/any.proto"; import "penumbra/core/app/v1/app.proto"; import "penumbra/core/asset/v1/asset.proto"; -import "penumbra/core/component/auction/v1alpha1/auction.proto"; +import "penumbra/core/component/auction/v1/auction.proto"; import "penumbra/core/component/dex/v1/dex.proto"; import "penumbra/core/component/fee/v1/fee.proto"; import "penumbra/core/component/ibc/v1/ibc.proto"; @@ -157,7 +157,7 @@ message AuctionsRequest { } message AuctionsResponse { - core.component.auction.v1alpha1.AuctionId id = 1; + core.component.auction.v1.AuctionId id = 1; // The note recording the auction NFT. SpendableNoteRecord note_record = 4; @@ -329,17 +329,17 @@ message TransactionPlannerRequest { message ActionDutchAuctionSchedule { // The description of the auction to schedule. - core.component.auction.v1alpha1.DutchAuctionDescription description = 1; + core.component.auction.v1.DutchAuctionDescription description = 1; } message ActionDutchAuctionEnd { // The unique id of the auction to close. - core.component.auction.v1alpha1.AuctionId auction_id = 1; + core.component.auction.v1.AuctionId auction_id = 1; } message ActionDutchAuctionWithdraw { // The auction to withdraw funds from. - core.component.auction.v1alpha1.AuctionId auction_id = 1; + core.component.auction.v1.AuctionId auction_id = 1; // The sequence number of the withdrawal. uint64 seq = 2; } diff --git a/tools/proto-compiler/src/main.rs b/tools/proto-compiler/src/main.rs index 061daf217d..f0e8f2f412 100644 --- a/tools/proto-compiler/src/main.rs +++ b/tools/proto-compiler/src/main.rs @@ -90,9 +90,9 @@ fn main() -> anyhow::Result<()> { "../../proto/penumbra/penumbra/core/app/v1/app.proto", "../../proto/penumbra/penumbra/core/asset/v1/asset.proto", "../../proto/penumbra/penumbra/core/txhash/v1/txhash.proto", + "../../proto/penumbra/penumbra/core/component/auction/v1/auction.proto", "../../proto/penumbra/penumbra/core/component/compact_block/v1/compact_block.proto", "../../proto/penumbra/penumbra/core/component/community_pool/v1/community_pool.proto", - "../../proto/penumbra/penumbra/core/component/auction/v1alpha1/auction.proto", "../../proto/penumbra/penumbra/core/component/dex/v1/dex.proto", "../../proto/penumbra/penumbra/core/component/distributions/v1/distributions.proto", "../../proto/penumbra/penumbra/core/component/funding/v1/funding.proto",