update osmosis-std to v22

packages/osmosis-std/Cargo.toml

@@ -3,7 +3,8 @@ description = "Standard library for Osmosis with CosmWasm support included"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 name = "osmosis-std"
-version = "0.21.0"
+repository = "https://github.com/osmosis-labs/osmosis-rust/"
+version = "0.22.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

packages/osmosis-std/src/types/OSMOSIS_COMMIT

@@ -1 +1 @@
-v21.0.0
+v22.0.0

packages/osmosis-std/src/types/osmosis/concentratedliquidity/mod.rs

@@ -36,7 +36,7 @@ pub struct Params {
     pub balancer_shares_reward_discount: ::prost::alloc::string::String,
     /// authorized_quote_denoms is a list of quote denoms that can be used as
     /// token1 when creating a pool. We limit the quote assets to a small set for
-    /// the purposes of having convinient price increments stemming from tick to
+    /// the purposes of having convenient price increments stemming from tick to
     /// price conversion. These increments are in a human readable magnitude only
     /// for token1 as a quote. For limit orders in the future, this will be a
     /// desirable property in terms of UX as to allow users to set limit orders at

packages/osmosis-std/src/types/osmosis/concentratedliquidity/v1beta1.rs

@@ -349,7 +349,7 @@ pub struct GenesisState {
     /// params are all the parameters of the module
     #[prost(message, optional, tag = "1")]
     pub params: ::core::option::Option<super::Params>,
-    /// pool data containining serialized pool struct and ticks.
+    /// pool data containing serialized pool struct and ticks.
     #[prost(message, repeated, tag = "2")]
     pub pool_data: ::prost::alloc::vec::Vec<PoolData>,
     #[prost(message, repeated, tag = "3")]

packages/osmosis-std/src/types/osmosis/cosmwasmpool/v1beta1.rs

@@ -495,7 +495,7 @@ pub struct CosmWasmPool {
 )]
 #[proto_message(type_url = "/osmosis.cosmwasmpool.v1beta1.GetSwapFeeQueryMsg")]
 pub struct GetSwapFeeQueryMsg {
-    /// get_swap_fee is the query strcuture to get swap fee.
+    /// get_swap_fee is the query structure to get swap fee.
     #[prost(message, optional, tag = "1")]
     pub get_swap_fee: ::core::option::Option<EmptyStruct>,
 }

packages/osmosis-std/src/types/osmosis/gamm/v1beta1.rs

@@ -1230,7 +1230,7 @@ pub struct QuerySpotPriceRequest {
     response_type = QueryPoolsWithFilterResponse
 )]
 pub struct QueryPoolsWithFilterRequest {
-    /// String of the coins in single string seperated by comma. Ex)
+    /// String of the coins in single string separated by comma. Ex)
     /// 10uatom,100uosmo
     #[prost(string, tag = "1")]
     pub min_liquidity: ::prost::alloc::string::String,

packages/osmosis-std/src/types/osmosis/gamm/v2.rs

@@ -30,7 +30,7 @@ pub struct QuerySpotPriceRequest {
     #[prost(string, tag = "3")]
     pub quote_asset_denom: ::prost::alloc::string::String,
 }
-/// Depreacted: please use alternate in x/poolmanager
+/// Deprecated: please use alternate in x/poolmanager
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
     Clone,

packages/osmosis-std/src/types/osmosis/incentives.rs

@@ -292,7 +292,7 @@ pub struct GenesisState {
     #[prost(message, repeated, tag = "2")]
     pub gauges: ::prost::alloc::vec::Vec<Gauge>,
     /// lockable_durations are all lockup durations that gauges can be locked for
-    /// in order to recieve incentives
+    /// in order to receive incentives
     #[prost(message, repeated, tag = "3")]
     pub lockable_durations: ::prost::alloc::vec::Vec<crate::shim::Duration>,
     /// last_gauge_id is what the gauge number will increment from when creating
@@ -674,7 +674,7 @@ pub struct RewardsEstRequest {
 )]
 #[proto_message(type_url = "/osmosis.incentives.RewardsEstResponse")]
 pub struct RewardsEstResponse {
-    /// Estimated coin rewards that will be recieved at provided address
+    /// Estimated coin rewards that will be received at provided address
     /// from specified locks between current time and end epoch
     #[prost(message, repeated, tag = "1")]
     pub coins: ::prost::alloc::vec::Vec<super::super::cosmos::base::v1beta1::Coin>,
@@ -709,7 +709,7 @@ pub struct QueryLockableDurationsRequest {}
 )]
 #[proto_message(type_url = "/osmosis.incentives.QueryLockableDurationsResponse")]
 pub struct QueryLockableDurationsResponse {
-    /// Time durations that users can lock coins for in order to recieve rewards
+    /// Time durations that users can lock coins for in order to receive rewards
     #[prost(message, repeated, tag = "1")]
     pub lockable_durations: ::prost::alloc::vec::Vec<crate::shim::Duration>,
 }

packages/osmosis-std/src/types/osmosis/mint/v1beta1.rs

@@ -144,7 +144,7 @@ pub struct GenesisState {
     /// minter is an abstraction for holding current rewards information.
     #[prost(message, optional, tag = "1")]
     pub minter: ::core::option::Option<Minter>,
-    /// params defines all the paramaters of the mint module.
+    /// params defines all the parameters of the mint module.
     #[prost(message, optional, tag = "2")]
     pub params: ::core::option::Option<Params>,
     /// reduction_started_epoch is the first epoch in which the reduction of mint

packages/osmosis-std/src/types/osmosis/poolincentives/v1beta1.rs

@@ -152,7 +152,7 @@ pub struct ConcentratedPoolToNoLockGauges {
 )]
 #[proto_message(type_url = "/osmosis.poolincentives.v1beta1.GenesisState")]
 pub struct GenesisState {
-    /// params defines all the paramaters of the module.
+    /// params defines all the parameters of the module.
     #[prost(message, optional, tag = "1")]
     pub params: ::core::option::Option<Params>,
     #[prost(message, repeated, tag = "2")]

packages/osmosis-std/src/types/osmosis/poolmanager/v1beta1.rs

@@ -389,7 +389,7 @@ pub struct Params {
     pub taker_fee_params: ::core::option::Option<TakerFeeParams>,
     /// authorized_quote_denoms is a list of quote denoms that can be used as
     /// token1 when creating a concentrated pool. We limit the quote assets to a
-    /// small set for the purposes of having convinient price increments stemming
+    /// small set for the purposes of having convenient price increments stemming
     /// from tick to price conversion. These increments are in a human readable
     /// magnitude only for token1 as a quote. For limit orders in the future, this
     /// will be a desirable property in terms of UX as to allow users to set limit
@@ -453,7 +453,7 @@ pub struct TakerFeeParams {
     #[prost(string, tag = "1")]
     pub default_taker_fee: ::prost::alloc::string::String,
     /// osmo_taker_fee_distribution defines the distribution of taker fees
-    /// generated in OSMO. As of this writing, it has two catagories:
+    /// generated in OSMO. As of this writing, it has two categories:
     /// - staking_rewards: the percent of the taker fee that gets distributed to
     ///    stakers.
     /// - community_pool: the percent of the taker fee that gets sent to the
@@ -463,7 +463,7 @@ pub struct TakerFeeParams {
     /// non_osmo_taker_fee_distribution defines the distribution of taker fees
     /// generated in non-OSMO. As of this writing, it has two categories:
     /// - staking_rewards: the percent of the taker fee that gets swapped to OSMO
-    ///    and then distirbuted to stakers.
+    ///    and then distributed to stakers.
     /// - community_pool: the percent of the taker fee that gets sent to the
     ///    community pool. Note: If the non-OSMO asset is an authorized_quote_denom,
     ///    that denom is sent directly to the community pool. Otherwise, it is

packages/osmosis-std/src/types/osmosis/protorev/v1beta1.rs

@@ -37,7 +37,8 @@ pub struct TokenPairArbRoutes {
 )]
 #[proto_message(type_url = "/osmosis.protorev.v1beta1.Route")]
 pub struct Route {
-    /// The pool IDs that are travered in the directed cyclic graph (traversed left
+    /// The pool IDs that are traversed in the directed cyclic graph (traversed
+    /// left
     /// -> right)
     #[prost(message, repeated, tag = "1")]
     pub trades: ::prost::alloc::vec::Vec<Trade>,
@@ -342,8 +343,6 @@ pub struct AllProtocolRevenue {
     #[prost(message, optional, tag = "1")]
     pub taker_fees_tracker:
         ::core::option::Option<super::super::poolmanager::v1beta1::TakerFeesTracker>,
-    #[prost(message, optional, tag = "2")]
-    pub tx_fees_tracker: ::core::option::Option<super::super::txfees::v1beta1::TxFeesTracker>,
     #[prost(message, optional, tag = "3")]
     pub cyclic_arb_tracker: ::core::option::Option<CyclicArbTracker>,
 }

packages/osmosis-std/src/types/osmosis/superfluid/mod.rs

@@ -58,10 +58,10 @@ pub struct SuperfluidIntermediaryAccount {
 /// The Osmo-Equivalent-Multiplier Record for epoch N refers to the osmo worth we
 /// treat an LP share as having, for all of epoch N. Eventually this is intended
 /// to be set as the Time-weighted-average-osmo-backing for the entire duration
-/// of epoch N-1. (Thereby locking whats in use for epoch N as based on the prior
-/// epochs rewards) However for now, this is not the TWAP but instead the spot
-/// price at the boundary. For different types of assets in the future, it could
-/// change.
+/// of epoch N-1. (Thereby locking what's in use for epoch N as based on the
+/// prior epochs rewards) However for now, this is not the TWAP but instead the
+/// spot price at the boundary. For different types of assets in the future, it
+/// could change.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
     Clone,

packages/osmosis-std/src/types/osmosis/tokenfactory/v1beta1.rs

@@ -64,7 +64,7 @@ pub struct Params {
 )]
 #[proto_message(type_url = "/osmosis.tokenfactory.v1beta1.GenesisState")]
 pub struct GenesisState {
-    /// params defines the paramaters of the module.
+    /// params defines the parameters of the module.
     #[prost(message, optional, tag = "1")]
     pub params: ::core::option::Option<Params>,
     #[prost(message, repeated, tag = "2")]

packages/osmosis-std/src/types/osmosis/twap/v1beta1.rs

@@ -55,7 +55,7 @@ pub struct TwapRecord {
     pub p1_arithmetic_twap_accumulator: ::prost::alloc::string::String,
     #[prost(string, tag = "10")]
     pub geometric_twap_accumulator: ::prost::alloc::string::String,
-    /// This field contains the time in which the last spot price error occured.
+    /// This field contains the time in which the last spot price error occurred.
     /// It is used to alert the caller if they are getting a potentially erroneous
     /// TWAP, due to an unforeseen underlying error.
     #[prost(message, optional, tag = "11")]

packages/osmosis-std/src/types/osmosis/txfees/v1beta1.rs

@@ -44,31 +44,6 @@ pub struct GenesisState {
     pub basedenom: ::prost::alloc::string::String,
     #[prost(message, repeated, tag = "2")]
     pub feetokens: ::prost::alloc::vec::Vec<FeeToken>,
-    /// KVStore state
-    #[prost(message, optional, tag = "3")]
-    pub tx_fees_tracker: ::core::option::Option<TxFeesTracker>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/osmosis.txfees.v1beta1.TxFeesTracker")]
-pub struct TxFeesTracker {
-    #[prost(message, repeated, tag = "1")]
-    pub tx_fees: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
-    #[prost(int64, tag = "2")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub height_accounting_starts_from: i64,
 }
 /// UpdateFeeTokenProposal is a gov Content type for adding new whitelisted fee
 /// token(s). It must specify a denom along with gamm pool ID to use as a spot

packages/osmosis-std/src/types/tendermint/types.rs

@@ -924,7 +924,6 @@ pub struct Block {
     #[prost(message, optional, tag = "4")]
     pub last_commit: ::core::option::Option<Commit>,
 }
-
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
     Clone,

packages/proto-build/src/main.rs

@@ -14,7 +14,7 @@ use proto_build::{
 const COSMOS_SDK_REV: &str = "v0.47.5-osmo";
 
 /// The osmosis commit or tag to be cloned and used to build the proto files
-const OSMOSIS_REV: &str = "v21.0.0";
+const OSMOSIS_REV: &str = "v22.0.0";
 
 /// The wasmd commit or tag to be cloned and used to build the proto files
 const WASMD_REV: &str = "v0.45.0-osmo";

packages/proto-build/src/main.rs--

@@ -11,13 +11,13 @@ use proto_build::{
 };
 
 /// The Cosmos SDK commit or tag to be cloned and used to build the proto files
-const COSMOS_SDK_REV: &str = "osmo/v0.47.5";
+const COSMOS_SDK_REV: &str = "v0.47.5-osmo";
 
 /// The osmosis commit or tag to be cloned and used to build the proto files
-const OSMOSIS_REV: &str = "v21.0.0-rc3";
+const OSMOSIS_REV: &str = "v21.0.0";
 
 /// The wasmd commit or tag to be cloned and used to build the proto files
-const WASMD_REV: &str = "osmo/v0.45.0";
+const WASMD_REV: &str = "v0.45.0-osmo";
 
 /// The cometbft commit or tag to be cloned and used to build the proto files
 const COMETBFT_REV: &str = "v0.37.2";