diff --git a/packages/injective-std/src/types/cosmos/auth/module/v1.rs b/packages/injective-std/src/types/cosmos/auth/module/v1.rs
index fefe129f..419b8338 100644
--- a/packages/injective-std/src/types/cosmos/auth/module/v1.rs
+++ b/packages/injective-std/src/types/cosmos/auth/module/v1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// Module is the config object for the auth module.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
diff --git a/packages/injective-std/src/types/cosmos/auth/v1beta1.rs b/packages/injective-std/src/types/cosmos/auth/v1beta1.rs
index a342762a..47efcd83 100644
--- a/packages/injective-std/src/types/cosmos/auth/v1beta1.rs
+++ b/packages/injective-std/src/types/cosmos/auth/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// BaseAccount defines a base account type. It contains all the necessary fields
 /// for basic account functionality. Any custom account type should extend this
 /// type for additional functionality (e.g. vesting).
diff --git a/packages/injective-std/src/types/cosmos/authz/module/v1.rs b/packages/injective-std/src/types/cosmos/authz/module/v1.rs
index aedf9a6b..abb31c22 100644
--- a/packages/injective-std/src/types/cosmos/authz/module/v1.rs
+++ b/packages/injective-std/src/types/cosmos/authz/module/v1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// Module is the config object of the authz module.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
diff --git a/packages/injective-std/src/types/cosmos/authz/v1beta1.rs b/packages/injective-std/src/types/cosmos/authz/v1beta1.rs
index 6b3fb058..19390eb4 100644
--- a/packages/injective-std/src/types/cosmos/authz/v1beta1.rs
+++ b/packages/injective-std/src/types/cosmos/authz/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// GenericAuthorization gives the grantee unrestricted permissions to execute
 /// the provided method on behalf of the granter's account.
 #[allow(clippy::derive_partial_eq_without_eq)]
diff --git a/packages/injective-std/src/types/cosmos/bank/module/v1.rs b/packages/injective-std/src/types/cosmos/bank/module/v1.rs
index 7d7fe1eb..9be838f1 100644
--- a/packages/injective-std/src/types/cosmos/bank/module/v1.rs
+++ b/packages/injective-std/src/types/cosmos/bank/module/v1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// Module is the config object of the bank module.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
diff --git a/packages/injective-std/src/types/cosmos/bank/v1beta1.rs b/packages/injective-std/src/types/cosmos/bank/v1beta1.rs
index 79839859..cf3ce368 100644
--- a/packages/injective-std/src/types/cosmos/bank/v1beta1.rs
+++ b/packages/injective-std/src/types/cosmos/bank/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// SendAuthorization allows the grantee to spend up to spend_limit coins from
 /// the granter's account.
 ///
diff --git a/packages/injective-std/src/types/cosmos/base/node/v1beta1.rs b/packages/injective-std/src/types/cosmos/base/node/v1beta1.rs
index 8fc27135..e305e32b 100644
--- a/packages/injective-std/src/types/cosmos/base/node/v1beta1.rs
+++ b/packages/injective-std/src/types/cosmos/base/node/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// ConfigRequest defines the request structure for the Config gRPC query.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
diff --git a/packages/injective-std/src/types/cosmos/base/query/v1beta1.rs b/packages/injective-std/src/types/cosmos/base/query/v1beta1.rs
index af7312d1..3a772e71 100644
--- a/packages/injective-std/src/types/cosmos/base/query/v1beta1.rs
+++ b/packages/injective-std/src/types/cosmos/base/query/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// PageRequest is to be embedded in gRPC request messages for efficient
 /// pagination. Ex:
 ///
diff --git a/packages/injective-std/src/types/cosmos/base/v1beta1.rs b/packages/injective-std/src/types/cosmos/base/v1beta1.rs
index 7048c4d3..ca0e7aaf 100644
--- a/packages/injective-std/src/types/cosmos/base/v1beta1.rs
+++ b/packages/injective-std/src/types/cosmos/base/v1beta1.rs
@@ -1,11 +1,11 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// Coin defines a token with a denomination and an amount.
 ///
 /// NOTE: The amount field is an Int which implements the custom method
 /// signatures required by gogoproto.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
-#[proto_message(type_url = "/cosmos.base.v1beta1.Coin")]
+#[proto_message(type_url = "/cosmos.base.v1beta1.CoinCoinCoin")]
 pub struct Coin {
     #[prost(string, tag = "1")]
     pub denom: ::prost::alloc::string::String,
@@ -18,7 +18,7 @@ pub struct Coin {
 /// signatures required by gogoproto.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
-#[proto_message(type_url = "/cosmos.base.v1beta1.DecCoin")]
+#[proto_message(type_url = "/cosmos.base.v1beta1.DecCoinDecCoinDecCoin")]
 pub struct DecCoin {
     #[prost(string, tag = "1")]
     pub denom: ::prost::alloc::string::String,
@@ -29,7 +29,7 @@ pub struct DecCoin {
 /// Deprecated: Prefer to use math.Int directly. It supports binary Marshal and Unmarshal.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
-#[proto_message(type_url = "/cosmos.base.v1beta1.IntProto")]
+#[proto_message(type_url = "/cosmos.base.v1beta1.IntProtoIntProtoIntProto")]
 pub struct IntProto {
     #[prost(string, tag = "1")]
     pub int: ::prost::alloc::string::String,
@@ -38,7 +38,7 @@ pub struct IntProto {
 /// Deprecated: Prefer to use math.LegacyDec directly. It supports binary Marshal and Unmarshal.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
-#[proto_message(type_url = "/cosmos.base.v1beta1.DecProto")]
+#[proto_message(type_url = "/cosmos.base.v1beta1.DecProtoDecProtoDecProto")]
 pub struct DecProto {
     #[prost(string, tag = "1")]
     pub dec: ::prost::alloc::string::String,
diff --git a/packages/injective-std/src/types/cosmos/distribution/module/v1.rs b/packages/injective-std/src/types/cosmos/distribution/module/v1.rs
index 5284ed70..6ee96c65 100644
--- a/packages/injective-std/src/types/cosmos/distribution/module/v1.rs
+++ b/packages/injective-std/src/types/cosmos/distribution/module/v1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// Module is the config object of the distribution module.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
diff --git a/packages/injective-std/src/types/cosmos/distribution/v1beta1.rs b/packages/injective-std/src/types/cosmos/distribution/v1beta1.rs
index 8c8c77fe..4d0437cc 100644
--- a/packages/injective-std/src/types/cosmos/distribution/v1beta1.rs
+++ b/packages/injective-std/src/types/cosmos/distribution/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// Params defines the set of params for the distribution module.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
diff --git a/packages/injective-std/src/types/cosmos/feegrant/module/v1.rs b/packages/injective-std/src/types/cosmos/feegrant/module/v1.rs
index 8455c874..d45f07c2 100644
--- a/packages/injective-std/src/types/cosmos/feegrant/module/v1.rs
+++ b/packages/injective-std/src/types/cosmos/feegrant/module/v1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// Module is the config object of the feegrant module.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
diff --git a/packages/injective-std/src/types/cosmos/feegrant/v1beta1.rs b/packages/injective-std/src/types/cosmos/feegrant/v1beta1.rs
index 28c72cd9..a6c9e802 100644
--- a/packages/injective-std/src/types/cosmos/feegrant/v1beta1.rs
+++ b/packages/injective-std/src/types/cosmos/feegrant/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// BasicAllowance implements Allowance with a one-time grant of coins
 /// that optionally expires. The grantee can use up to SpendLimit to cover fees.
 #[allow(clippy::derive_partial_eq_without_eq)]
diff --git a/packages/injective-std/src/types/cosmos/gov/module/v1.rs b/packages/injective-std/src/types/cosmos/gov/module/v1.rs
index a273e5ed..9ff16316 100644
--- a/packages/injective-std/src/types/cosmos/gov/module/v1.rs
+++ b/packages/injective-std/src/types/cosmos/gov/module/v1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// Module is the config object of the gov module.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
diff --git a/packages/injective-std/src/types/cosmos/gov/v1.rs b/packages/injective-std/src/types/cosmos/gov/v1.rs
index 681823a6..45db4181 100644
--- a/packages/injective-std/src/types/cosmos/gov/v1.rs
+++ b/packages/injective-std/src/types/cosmos/gov/v1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// WeightedVoteOption defines a unit of vote for vote split.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
diff --git a/packages/injective-std/src/types/cosmos/gov/v1beta1.rs b/packages/injective-std/src/types/cosmos/gov/v1beta1.rs
index 8f57455b..06ad2b6e 100644
--- a/packages/injective-std/src/types/cosmos/gov/v1beta1.rs
+++ b/packages/injective-std/src/types/cosmos/gov/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// WeightedVoteOption defines a unit of vote for vote split.
 ///
 /// Since: cosmos-sdk 0.43
diff --git a/packages/injective-std/src/types/cosmos/params/module/v1.rs b/packages/injective-std/src/types/cosmos/params/module/v1.rs
index b197cf1e..0f736a32 100644
--- a/packages/injective-std/src/types/cosmos/params/module/v1.rs
+++ b/packages/injective-std/src/types/cosmos/params/module/v1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// Module is the config object of the params module.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
diff --git a/packages/injective-std/src/types/cosmos/params/v1beta1.rs b/packages/injective-std/src/types/cosmos/params/v1beta1.rs
index 92ca9c6a..e8b2acf7 100644
--- a/packages/injective-std/src/types/cosmos/params/v1beta1.rs
+++ b/packages/injective-std/src/types/cosmos/params/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// ParameterChangeProposal defines a proposal to change one or more parameters.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
diff --git a/packages/injective-std/src/types/cosmos/staking/v1beta1.rs b/packages/injective-std/src/types/cosmos/staking/v1beta1.rs
index c19b38a3..4d231ceb 100644
--- a/packages/injective-std/src/types/cosmos/staking/v1beta1.rs
+++ b/packages/injective-std/src/types/cosmos/staking/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// NOTE: The following type is not implemented due to current limitations of code generator
 /// which currently has issue with tendermint_proto.
 /// This will be fixed in the upcoming release.
diff --git a/packages/injective-std/src/types/cosmwasm/wasm/v1.rs b/packages/injective-std/src/types/cosmwasm/wasm/v1.rs
index 3c62164c..a8c3ffbb 100644
--- a/packages/injective-std/src/types/cosmwasm/wasm/v1.rs
+++ b/packages/injective-std/src/types/cosmwasm/wasm/v1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// AccessTypeParam
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
diff --git a/packages/injective-std/src/types/injective/auction/v1beta1.rs b/packages/injective-std/src/types/injective/auction/v1beta1.rs
index 669385c6..79ecb168 100644
--- a/packages/injective-std/src/types/injective/auction/v1beta1.rs
+++ b/packages/injective-std/src/types/injective/auction/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
 #[proto_message(type_url = "/injective.auction.v1beta1.Params")]
@@ -13,8 +13,7 @@ pub struct Params {
     /// min_next_bid_increment_rate defines the minimum increment rate for new bids
     #[prost(string, tag = "2")]
     pub min_next_bid_increment_rate: ::prost::alloc::string::String,
-    /// inj_basket_max_cap defines the maximum cap for INJ contained in an auction
-    /// basket
+    /// inj_basket_max_cap defines the maximum cap for INJ contained in an auction basket
     #[prost(string, tag = "3")]
     pub inj_basket_max_cap: ::prost::alloc::string::String,
 }
@@ -24,8 +23,8 @@ pub struct Params {
 pub struct Bid {
     #[prost(string, tag = "1")]
     pub bidder: ::prost::alloc::string::String,
-    #[prost(message, optional, tag = "2")]
-    pub amount: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(string, tag = "2")]
+    pub amount: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
@@ -35,8 +34,8 @@ pub struct LastAuctionResult {
     #[prost(string, tag = "1")]
     pub winner: ::prost::alloc::string::String,
     /// amount describes the amount the winner get from the auction
-    #[prost(message, optional, tag = "2")]
-    pub amount: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(string, tag = "2")]
+    pub amount: ::prost::alloc::string::String,
     /// round defines the round number of auction
     #[prost(uint64, tag = "3")]
     #[serde(
@@ -53,8 +52,8 @@ pub struct EventBid {
     #[prost(string, tag = "1")]
     pub bidder: ::prost::alloc::string::String,
     /// amount describes the amount the bidder put on the auction
-    #[prost(message, optional, tag = "2")]
-    pub amount: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(string, tag = "2")]
+    pub amount: ::prost::alloc::string::String,
     /// round defines the round number of auction
     #[prost(uint64, tag = "3")]
     #[serde(
@@ -71,8 +70,8 @@ pub struct EventAuctionResult {
     #[prost(string, tag = "1")]
     pub winner: ::prost::alloc::string::String,
     /// amount describes the amount the winner get from the auction
-    #[prost(message, optional, tag = "2")]
-    pub amount: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(string, tag = "2")]
+    pub amount: ::prost::alloc::string::String,
     /// round defines the round number of auction
     #[prost(uint64, tag = "3")]
     #[serde(
diff --git a/packages/injective-std/src/types/injective/exchange/v1beta1.rs b/packages/injective-std/src/types/injective/exchange/v1beta1.rs
index 5bccf895..680a0bf3 100644
--- a/packages/injective-std/src/types/injective/exchange/v1beta1.rs
+++ b/packages/injective-std/src/types/injective/exchange/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// spot authz messages
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
@@ -359,13 +359,6 @@ pub struct DerivativeMarket {
         deserialize_with = "crate::serde::as_str::deserialize"
     )]
     pub admin_permissions: u32,
-    /// quote token decimals
-    #[prost(uint32, tag = "20")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub quote_decimals: u32,
 }
 /// An object describing a binary options market in Injective Protocol.
 #[allow(clippy::derive_partial_eq_without_eq)]
@@ -457,13 +450,6 @@ pub struct BinaryOptionsMarket {
         deserialize_with = "crate::serde::as_str::deserialize"
     )]
     pub admin_permissions: u32,
-    /// quote token decimals
-    #[prost(uint32, tag = "20")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub quote_decimals: u32,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
@@ -643,20 +629,6 @@ pub struct SpotMarket {
         deserialize_with = "crate::serde::as_str::deserialize"
     )]
     pub admin_permissions: u32,
-    /// base token decimals
-    #[prost(uint32, tag = "14")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub base_decimals: u32,
-    /// quote token decimals
-    #[prost(uint32, tag = "15")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub quote_decimals: u32,
 }
 /// A subaccount's deposit for a given base currency
 #[allow(clippy::derive_partial_eq_without_eq)]
@@ -2099,20 +2071,6 @@ pub struct MsgInstantSpotMarketLaunch {
     /// orders in the market
     #[prost(string, tag = "7")]
     pub min_notional: ::prost::alloc::string::String,
-    /// base token decimals
-    #[prost(uint32, tag = "8")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub base_decimals: u32,
-    /// quote token decimals
-    #[prost(uint32, tag = "9")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub quote_decimals: u32,
 }
 /// MsgInstantSpotMarketLaunchResponse defines the Msg/InstantSpotMarketLaunch
 /// response type.
@@ -3377,20 +3335,6 @@ pub struct SpotMarketParamUpdateProposal {
     pub min_notional: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "12")]
     pub admin_info: ::core::option::Option<AdminInfo>,
-    /// base token decimals
-    #[prost(uint32, tag = "13")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub base_decimals: u32,
-    /// quote token decimals
-    #[prost(uint32, tag = "14")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub quote_decimals: u32,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
@@ -3475,20 +3419,6 @@ pub struct SpotMarketLaunchProposal {
     pub min_notional: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "11")]
     pub admin_info: ::core::option::Option<AdminInfo>,
-    /// base token decimals
-    #[prost(uint32, tag = "14")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub base_decimals: u32,
-    /// quote token decimals
-    #[prost(uint32, tag = "15")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub quote_decimals: u32,
 }
 /// PerpetualMarketLaunchProposal defines a SDK message for proposing a new
 /// perpetual futures market through governance
@@ -4928,7 +4858,7 @@ pub struct FullDerivativeMarket {
 }
 /// Nested message and enum types in `FullDerivativeMarket`.
 pub mod full_derivative_market {
-    use injective_std_derive::CosmwasmExt;
+    use osmosis_std_derive::CosmwasmExt;
     #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, Eq, ::prost::Oneof, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema)]
     pub enum Info {
@@ -5712,65 +5642,6 @@ pub struct QueryTraderDerivativeConditionalOrdersResponse {
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
-#[proto_message(type_url = "/injective.exchange.v1beta1.QueryFullSpotOrderbookRequest")]
-#[proto_query(
-    path = "/injective.exchange.v1beta1.Query/L3SpotOrderBook",
-    response_type = QueryFullSpotOrderbookResponse
-)]
-pub struct QueryFullSpotOrderbookRequest {
-    /// market id
-    #[prost(string, tag = "1")]
-    #[serde(alias = "marketID")]
-    pub market_id: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
-#[proto_message(type_url = "/injective.exchange.v1beta1.QueryFullSpotOrderbookResponse")]
-pub struct QueryFullSpotOrderbookResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub bids: ::prost::alloc::vec::Vec<TrimmedLimitOrder>,
-    #[prost(message, repeated, tag = "2")]
-    pub asks: ::prost::alloc::vec::Vec<TrimmedLimitOrder>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
-#[proto_message(type_url = "/injective.exchange.v1beta1.QueryFullDerivativeOrderbookRequest")]
-#[proto_query(
-    path = "/injective.exchange.v1beta1.Query/L3DerivativeOrderBook",
-    response_type = QueryFullDerivativeOrderbookResponse
-)]
-pub struct QueryFullDerivativeOrderbookRequest {
-    /// market id
-    #[prost(string, tag = "1")]
-    #[serde(alias = "marketID")]
-    pub market_id: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
-#[proto_message(type_url = "/injective.exchange.v1beta1.QueryFullDerivativeOrderbookResponse")]
-pub struct QueryFullDerivativeOrderbookResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub bids: ::prost::alloc::vec::Vec<TrimmedLimitOrder>,
-    #[prost(message, repeated, tag = "2")]
-    pub asks: ::prost::alloc::vec::Vec<TrimmedLimitOrder>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
-#[proto_message(type_url = "/injective.exchange.v1beta1.TrimmedLimitOrder")]
-pub struct TrimmedLimitOrder {
-    #[prost(string, tag = "1")]
-    pub price: ::prost::alloc::string::String,
-    /// quantity of the order
-    #[prost(string, tag = "2")]
-    pub quantity: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub order_hash: ::prost::alloc::string::String,
-    #[prost(string, tag = "4")]
-    #[serde(alias = "subaccountID")]
-    pub subaccount_id: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
 #[proto_message(type_url = "/injective.exchange.v1beta1.QueryMarketAtomicExecutionFeeMultiplierRequest")]
 #[proto_query(
     path = "/injective.exchange.v1beta1.Query/MarketAtomicExecutionFeeMultiplier",
@@ -5920,15 +5791,6 @@ impl<'a, Q: cosmwasm_std::CustomQuery> ExchangeQuerier<'a, Q> {
     pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
         Self { querier }
     }
-    pub fn l3_derivative_order_book(
-        &self,
-        market_id: ::prost::alloc::string::String,
-    ) -> Result<QueryFullDerivativeOrderbookResponse, cosmwasm_std::StdError> {
-        QueryFullDerivativeOrderbookRequest { market_id }.query(self.querier)
-    }
-    pub fn l3_spot_order_book(&self, market_id: ::prost::alloc::string::String) -> Result<QueryFullSpotOrderbookResponse, cosmwasm_std::StdError> {
-        QueryFullSpotOrderbookRequest { market_id }.query(self.querier)
-    }
     pub fn query_exchange_params(&self) -> Result<QueryExchangeParamsResponse, cosmwasm_std::StdError> {
         QueryExchangeParamsRequest {}.query(self.querier)
     }
diff --git a/packages/injective-std/src/types/injective/insurance/v1beta1.rs b/packages/injective-std/src/types/injective/insurance/v1beta1.rs
index 759d5dfb..3f09147c 100644
--- a/packages/injective-std/src/types/injective/insurance/v1beta1.rs
+++ b/packages/injective-std/src/types/injective/insurance/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
 #[proto_message(type_url = "/injective.insurance.v1beta1.Params")]
diff --git a/packages/injective-std/src/types/injective/oracle/v1beta1.rs b/packages/injective-std/src/types/injective/oracle/v1beta1.rs
index c08caa38..6a7add17 100644
--- a/packages/injective-std/src/types/injective/oracle/v1beta1.rs
+++ b/packages/injective-std/src/types/injective/oracle/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
 #[proto_message(type_url = "/injective.oracle.v1beta1.Params")]
diff --git a/packages/injective-std/src/types/injective/peggy/v1.rs b/packages/injective-std/src/types/injective/peggy/v1.rs
index 69eb4644..8f7118df 100644
--- a/packages/injective-std/src/types/injective/peggy/v1.rs
+++ b/packages/injective-std/src/types/injective/peggy/v1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// Attestation is an aggregate of `claims` that eventually becomes `observed` by
 /// all orchestrators
 /// EVENT_NONCE:
diff --git a/packages/injective-std/src/types/injective/permissions/v1beta1.rs b/packages/injective-std/src/types/injective/permissions/v1beta1.rs
index 69ef141d..2fd685fc 100644
--- a/packages/injective-std/src/types/injective/permissions/v1beta1.rs
+++ b/packages/injective-std/src/types/injective/permissions/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
 #[proto_message(type_url = "/injective.permissions.v1beta1.EventSetVoucher")]
@@ -323,7 +323,7 @@ pub struct MsgUpdateNamespace {
 }
 /// Nested message and enum types in `MsgUpdateNamespace`.
 pub mod msg_update_namespace {
-    use injective_std_derive::CosmwasmExt;
+    use osmosis_std_derive::CosmwasmExt;
     #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
     #[proto_message(type_url = "/injective.permissions.v1beta1.MsgUpdateNamespace.MsgSetWasmHook")]
diff --git a/packages/injective-std/src/types/injective/tokenfactory/v1beta1.rs b/packages/injective-std/src/types/injective/tokenfactory/v1beta1.rs
index c2e99c63..611e8a8a 100644
--- a/packages/injective-std/src/types/injective/tokenfactory/v1beta1.rs
+++ b/packages/injective-std/src/types/injective/tokenfactory/v1beta1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 /// DenomAuthorityMetadata specifies metadata for addresses that have specific
 /// capabilities over a token factory denom. Right now there is only one Admin
 /// permission, but is planned to be extended to the future.
diff --git a/packages/injective-std/src/types/injective/wasmx/v1.rs b/packages/injective-std/src/types/injective/wasmx/v1.rs
index 689b3591..7f5007fe 100644
--- a/packages/injective-std/src/types/injective/wasmx/v1.rs
+++ b/packages/injective-std/src/types/injective/wasmx/v1.rs
@@ -1,4 +1,4 @@
-use injective_std_derive::CosmwasmExt;
+use osmosis_std_derive::CosmwasmExt;
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
 #[proto_message(type_url = "/injective.wasmx.v1.ContractRegistrationRequestProposal")]