From abbfcce3ff6c3e0d5696733019d393a46895292b Mon Sep 17 00:00:00 2001
From: Guy Garcia <guy.garcia@protonmail.com>
Date: Mon, 14 Oct 2024 11:42:44 -0400
Subject: [PATCH 1/7] Updated parser to remove custom serde functions

---
 Cargo.lock                |   2 +-
 packages/proto/Cargo.toml |   2 +-
 packages/proto/src/any.rs |  85 ++++++++++++++++++
 proto-build/src/parser.rs | 175 +++++++++++++++-----------------------
 4 files changed, 155 insertions(+), 109 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 47e278e..f4905a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "archway-proto"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "anyhow",
  "pbjson",
diff --git a/packages/proto/Cargo.toml b/packages/proto/Cargo.toml
index 04405dc..785807c 100644
--- a/packages/proto/Cargo.toml
+++ b/packages/proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "archway-proto"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 description = "Rust build of Archway's ProtoBuf definitions"
 authors.workspace = true
diff --git a/packages/proto/src/any.rs b/packages/proto/src/any.rs
index 57e147d..de478cd 100644
--- a/packages/proto/src/any.rs
+++ b/packages/proto/src/any.rs
@@ -1,6 +1,58 @@
+use prost::bytes::{Buf, BufMut};
 use prost::{Message, Name};
 use serde::{ser, Deserialize, Deserializer, Serialize, Serializer};
 
+/// Works as a wrapper for Vec<u8> when working with structures that have an undefined/unknown type.
+#[derive(:: serde :: Serialize, :: serde :: Deserialize, Clone, PartialEq, Debug, Default)]
+pub struct GenericData(pub Vec<u8>);
+
+impl Message for GenericData {
+    fn encode_raw<B>(&self, buf: &mut B)
+    where
+        B: BufMut,
+    {
+        buf.put_slice(self.0.as_slice());
+    }
+
+    fn merge_field<B>(
+        &mut self,
+        tag: u32,
+        _wire_type: prost::encoding::WireType,
+        buf: &mut B,
+        _ctx: prost::encoding::DecodeContext,
+    ) -> Result<(), prost::DecodeError>
+    where
+        B: Buf,
+    {
+        if tag == 1 {
+            self.0.push(10u8);
+            while buf.has_remaining() {
+                self.0.push(buf.get_u8());
+            }
+            Ok(())
+        } else {
+            Err(prost::DecodeError::new("invalid tag"))
+        }
+    }
+
+    fn encoded_len(&self) -> usize {
+        self.0.len()
+    }
+
+    fn clear(&mut self) {
+        self.0.clear();
+    }
+}
+
+impl Name for GenericData {
+    const NAME: &'static str = "";
+    const PACKAGE: &'static str = "";
+
+    fn full_name() -> String {
+        format!("{}{}", Self::PACKAGE, Self::NAME)
+    }
+}
+
 // An improved any type that allows you to implement typing directly into it
 #[derive(Clone, PartialEq, Serialize, Deserialize, Message)]
 pub struct Any<T: Message + PartialEq + Default> {
@@ -17,6 +69,13 @@ impl<T: Message + Name + PartialEq + Default> Any<T> {
             value,
         }
     }
+
+    pub fn generic(value: T) -> Any<GenericData> {
+        Any {
+            type_url: T::full_name(),
+            value: GenericData(value.encode_to_vec()),
+        }
+    }
 }
 
 // Deserialize data shown inside Any<T> and return T
@@ -146,6 +205,7 @@ pub mod vec {
 
 #[cfg(test)]
 mod test {
+    use crate::any::{Any, GenericData};
     use prost::{Message, Name};
     use serde::de::DeserializeOwned;
     use serde::{Deserialize, Serialize};
@@ -239,6 +299,31 @@ mod test {
         }
     }
 
+    #[test]
+    fn generic_equal_any() {
+        let val = AnyValue {
+            value: "testinnnng".to_string(),
+            number: 33,
+        };
+
+        dbg!(val.encode_to_vec());
+        dbg!(GenericData(val.encode_to_vec()).encode_to_vec());
+
+        let real_any = Any::new(val.clone());
+        let bytes_any = Any::generic(val);
+
+        let mut real_encoded = real_any.encode_to_vec();
+        let mut bytes_encoded = bytes_any.encode_to_vec();
+
+        assert_eq!(real_encoded, bytes_encoded);
+
+        let real_decoded = Any::<AnyValue>::decode(bytes_encoded.as_slice()).unwrap();
+        let bytes_decoded = Any::<GenericData>::decode(real_encoded.as_slice()).unwrap();
+
+        assert_eq!(real_decoded.type_url, bytes_decoded.type_url);
+        assert_eq!(real_decoded.value.encode_to_vec(), bytes_decoded.value.0);
+    }
+
     #[test]
     fn test_ser_de() {
         let test = Test {
diff --git a/proto-build/src/parser.rs b/proto-build/src/parser.rs
index f0b8278..3ca160f 100644
--- a/proto-build/src/parser.rs
+++ b/proto-build/src/parser.rs
@@ -1,19 +1,18 @@
 use crate::patch_file;
 use glob::glob;
-use proc_macro2::{Literal, Punct, Spacing, Span, TokenStream};
-use quote::{quote, TokenStreamExt};
+use proc_macro2::Span;
+use quote::quote;
 use regex::Regex;
 use std::cmp::Ordering;
 use std::collections::BTreeMap;
 use std::fs;
 use std::path::PathBuf;
 use syn::punctuated::Punctuated;
-use syn::token::{Paren, PathSep};
+use syn::token::PathSep;
 use syn::{
-    AngleBracketedGenericArguments, AttrStyle, Attribute, Field, Fields, FieldsNamed, File,
-    GenericArgument, GenericParam, Ident, Item, ItemStruct, MacroDelimiter, Meta, MetaList, Path,
-    PathArguments, PathSegment, TraitBound, TraitBoundModifier, Type, TypeParam, TypeParamBound,
-    TypePath,
+    AngleBracketedGenericArguments, Field, Fields, FieldsNamed, File, GenericArgument,
+    GenericParam, Ident, Item, ItemStruct, Path, PathArguments, PathSegment, TraitBound,
+    TraitBoundModifier, Type, TypeParam, TypeParamBound, TypePath,
 };
 
 fn as_struct(item: &mut Item) -> Option<&mut ItemStruct> {
@@ -78,6 +77,63 @@ fn is_important(field: &mut Field) -> Option<(FoundEnclosure, &mut TypePath)> {
 // prost Message implements a generic B which was conflicting with this script
 const GENERICS: [&str; 10] = ["A", "BB", "C", "D", "E", "F", "G", "H", "I", "J"];
 
+fn gen_any(name: &str) -> Path {
+    let mut paths = create_punctuated(vec!["crate", "any"]);
+
+    let mut punctuation = Punctuated::new();
+    punctuation.push(GenericArgument::Type(Type::Path(TypePath {
+        qself: None,
+        path: gen_generic(name),
+    })));
+
+    paths.push(PathSegment {
+        ident: Ident::new("Any", Span::call_site()),
+        arguments: PathArguments::AngleBracketed(AngleBracketedGenericArguments {
+            colon2_token: None,
+            lt_token: Default::default(),
+            args: punctuation,
+            gt_token: Default::default(),
+        }),
+    });
+
+    Path {
+        leading_colon: None,
+        segments: paths,
+    }
+}
+
+/// Find any type of Any<GENERIC>
+fn contains_any_generic(segment: &PathSegment) -> bool {
+    if segment.ident == "Any" {
+        if let PathArguments::AngleBracketed(arguments) = &segment.arguments {
+            if let Some(GenericArgument::Type(Type::Path(type_path))) = arguments.args.last() {
+                return GENERICS.contains(
+                    &type_path
+                        .path
+                        .segments
+                        .last()
+                        .unwrap()
+                        .ident
+                        .to_string()
+                        .as_str(),
+                );
+            }
+        }
+    }
+
+    false
+}
+
+/// Function assumes we have a type Any already and want to update the generic
+fn replace_generic(segment: &mut PathSegment, name: &str) {
+    if let PathArguments::AngleBracketed(arguments) = &mut segment.arguments {
+        if let Some(GenericArgument::Type(Type::Path(type_path))) = arguments.args.last_mut() {
+            let last = type_path.path.segments.last_mut().unwrap();
+            last.ident = Ident::new(name, Span::call_site());
+        }
+    }
+}
+
 fn gen_generic(name: &str) -> Path {
     Path {
         leading_colon: None,
@@ -118,12 +174,6 @@ fn gen_unnamed_param(name: &str) -> TypeParam {
     type_param
         .bounds
         .push(trait_param_bound(vec!["prost", "Message"]));
-    type_param
-        .bounds
-        .push(trait_param_bound(vec!["serde", "Serialize"]));
-    type_param
-        .bounds
-        .push(trait_param_bound(vec!["serde", "de", "DeserializeOwned"]));
 
     type_param
 }
@@ -160,11 +210,6 @@ fn load_and_patch_any(out_dir: &str) -> BTreeMap<String, (File, BTreeMap<String,
     for src in src_files {
         let current_file = fs::read_to_string(&src).unwrap();
 
-        // // Filter files that dont have `Any`
-        // if !any_filter.is_match(&current_file) {
-        //     continue;
-        // }
-
         let mut ast = syn::parse_file(&current_file).unwrap();
 
         // Get all struct we might work with here
@@ -177,49 +222,14 @@ fn load_and_patch_any(out_dir: &str) -> BTreeMap<String, (File, BTreeMap<String,
                 // Find any fields and replace with generics
                 let fields = as_named_fields(&mut item.fields).unwrap();
                 for field in fields.named.iter_mut() {
-                    if let Some((ty, path)) = is_important(field) {
+                    if let Some((_, path)) = is_important(field) {
                         if path.path.segments.last().unwrap().ident == "Any" {
                             // Set struct generics
                             let generic = GENERICS[item.generics.params.len()];
-                            path.path = gen_generic(generic);
+                            path.path = gen_any(generic);
                             item.generics
                                 .params
                                 .push(GenericParam::Type(gen_type_param(generic)));
-
-                            // Set serialization function
-                            let serde_path = match ty {
-                                FoundEnclosure::Option => "option",
-                                FoundEnclosure::Vec => "vec",
-                            };
-
-                            let mut token_stream = TokenStream::new();
-                            token_stream.append(Ident::new("serialize_with", Span::call_site()));
-                            token_stream.append(Punct::new('=', Spacing::Alone));
-                            token_stream.append(Literal::string(&format!(
-                                "crate::any::{}::serialize",
-                                serde_path
-                            )));
-                            token_stream.append(Punct::new(',', Spacing::Alone));
-                            token_stream.append(Ident::new("deserialize_with", Span::call_site()));
-                            token_stream.append(Punct::new('=', Spacing::Alone));
-                            token_stream.append(Literal::string(&format!(
-                                "crate::any::{}::deserialize",
-                                serde_path
-                            )));
-
-                            field.attrs.push(Attribute {
-                                pound_token: Default::default(),
-                                style: AttrStyle::Outer,
-                                bracket_token: Default::default(),
-                                meta: Meta::List(MetaList {
-                                    path: Path {
-                                        leading_colon: None,
-                                        segments: create_punctuated(vec!["serde"]),
-                                    },
-                                    delimiter: MacroDelimiter::Paren(Paren::default()),
-                                    tokens: token_stream,
-                                }),
-                            });
                         }
                     }
                 }
@@ -277,8 +287,7 @@ fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize>)>)
                     .iter_mut()
                 {
                     let name = field.ident.clone().unwrap().to_string();
-                    let mut found_ty = None;
-                    if let Some((field_ty, path)) = is_important(field) {
+                    if let Some((_, path)) = is_important(field) {
                         let ty = path.path.segments.last_mut().unwrap();
 
                         let ident_name = ty.ident.to_string();
@@ -319,7 +328,6 @@ fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize>)>)
                                 key.items.get_mut(*s.get("GenesisState").unwrap()).unwrap(),
                             )
                             .unwrap();
-                            found_ty = Some(field_ty);
                             new_total_generics = push_generics(ty_struct, ty, new_total_generics);
                         } else if let Some(i) = structs.get(&ident_name) {
                             let ty_item = match i.cmp(&idx) {
@@ -329,10 +337,9 @@ fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize>)>)
                             };
 
                             let ty_struct = as_struct(ty_item).unwrap();
-                            found_ty = Some(field_ty);
                             new_total_generics = push_generics(ty_struct, ty, new_total_generics);
-                        } else if GENERICS.contains(&&*ident_name) {
-                            ty.ident = Ident::new(GENERICS[new_total_generics], Span::call_site());
+                        } else if contains_any_generic(ty) {
+                            replace_generic(ty, GENERICS[new_total_generics]);
                             new_total_generics += 1;
                         } else if let Some((_, (other_ast, other_structs))) = files
                             .iter_mut()
@@ -345,55 +352,9 @@ fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize>)>)
                                     .unwrap(),
                             )
                             .unwrap();
-                            found_ty = Some(field_ty);
                             new_total_generics = push_generics(ty_struct, ty, new_total_generics);
                         }
                     }
-
-                    // Try to add field attrs
-                    if let Some(found_ty) = found_ty {
-                        let last = field.attrs.last().unwrap().clone();
-                        if let Meta::List(meta_list) = &last.meta {
-                            if meta_list.path.segments.last().unwrap().ident != "serde" {
-                                // Set serialization function
-                                let serde_path = match found_ty {
-                                    FoundEnclosure::Option => "option",
-                                    FoundEnclosure::Vec => "vec",
-                                };
-
-                                let mut token_stream = TokenStream::new();
-                                token_stream
-                                    .append(Ident::new("serialize_with", Span::call_site()));
-                                token_stream.append(Punct::new('=', Spacing::Alone));
-                                token_stream.append(Literal::string(&format!(
-                                    "crate::any::{}::generic_serialize",
-                                    serde_path
-                                )));
-                                token_stream.append(Punct::new(',', Spacing::Alone));
-                                token_stream
-                                    .append(Ident::new("deserialize_with", Span::call_site()));
-                                token_stream.append(Punct::new('=', Spacing::Alone));
-                                token_stream.append(Literal::string(&format!(
-                                    "crate::any::{}::generic_deserialize",
-                                    serde_path
-                                )));
-
-                                field.attrs.push(Attribute {
-                                    pound_token: Default::default(),
-                                    style: AttrStyle::Outer,
-                                    bracket_token: Default::default(),
-                                    meta: Meta::List(MetaList {
-                                        path: Path {
-                                            leading_colon: None,
-                                            segments: create_punctuated(vec!["serde"]),
-                                        },
-                                        delimiter: MacroDelimiter::Paren(Paren::default()),
-                                        tokens: token_stream,
-                                    }),
-                                });
-                            }
-                        }
-                    }
                 }
 
                 if new_total_generics > 0 {

From edecc6045c056254577bb244a7e71305d5bce804 Mon Sep 17 00:00:00 2001
From: Guy Garcia <guy.garcia@protonmail.com>
Date: Mon, 14 Oct 2024 11:48:58 -0400
Subject: [PATCH 2/7] Patched generated files

---
 .../src/gen/archway.cwica.v1.abstract.rs      |  59 +-
 .../src/gen/archway.genmsg.v1.abstract.rs     |  32 +-
 .../src/gen/cosmos.app.v1alpha1.abstract.rs   | 104 +-
 .../src/gen/cosmos.auth.v1beta1.abstract.rs   | 254 +----
 .../src/gen/cosmos.authz.v1beta1.abstract.rs  | 255 +----
 .../gen/cosmos.base.abci.v1beta1.abstract.rs  | 167 +---
 ...cosmos.base.tendermint.v1beta1.abstract.rs | 137 +--
 .../gen/cosmos.crypto.keyring.v1.abstract.rs  |  31 +-
 .../gen/cosmos.crypto.multisig.abstract.rs    |  29 +-
 .../gen/cosmos.evidence.v1beta1.abstract.rs   | 127 +--
 .../gen/cosmos.feegrant.v1beta1.abstract.rs   | 232 +----
 .../proto/src/gen/cosmos.gov.v1.abstract.rs   | 297 +-----
 .../src/gen/cosmos.gov.v1beta1.abstract.rs    | 252 +----
 .../proto/src/gen/cosmos.group.v1.abstract.rs | 511 +---------
 .../src/gen/cosmos.nft.v1beta1.abstract.rs    | 263 +----
 .../gen/cosmos.orm.query.v1alpha1.abstract.rs |  76 +-
 .../gen/cosmos.staking.v1beta1.abstract.rs    | 456 +--------
 .../gen/cosmos.tx.signing.v1beta1.abstract.rs |  56 +-
 .../src/gen/cosmos.tx.v1beta1.abstract.rs     | 936 ++----------------
 .../gen/cosmos.upgrade.v1beta1.abstract.rs    | 116 +--
 .../gen/cosmos.vesting.v1beta1.abstract.rs    | 167 +---
 .../src/gen/cosmwasm.wasm.v1.abstract.rs      | 454 +--------
 ...cations.interchain_accounts.v1.abstract.rs |  58 +-
 .../src/gen/ibc.core.channel.v1.abstract.rs   | 256 +----
 .../src/gen/ibc.core.client.v1.abstract.rs    | 571 ++---------
 .../gen/ibc.core.connection.v1.abstract.rs    | 226 +----
 .../src/gen/ibc.core.types.v1.abstract.rs     |  44 +-
 ...bc.lightclients.solomachine.v2.abstract.rs | 195 +---
 ...bc.lightclients.solomachine.v3.abstract.rs | 129 +--
 29 files changed, 596 insertions(+), 5894 deletions(-)

diff --git a/packages/proto/src/gen/archway.cwica.v1.abstract.rs b/packages/proto/src/gen/archway.cwica.v1.abstract.rs
index 5e6e239..9766af1 100644
--- a/packages/proto/src/gen/archway.cwica.v1.abstract.rs
+++ b/packages/proto/src/gen/archway.cwica.v1.abstract.rs
@@ -66,10 +66,6 @@ impl ::prost::Name for Params {
 pub struct GenesisState {
     #[doc = " params defines all the parameters of the module."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for GenesisState {
@@ -98,10 +94,6 @@ impl ::prost::Name for QueryParamsRequest {
 pub struct QueryParamsResponse {
     #[doc = " params defines the parameters for the module"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for QueryParamsResponse {
@@ -119,10 +111,6 @@ impl ::prost::Name for QueryParamsResponse {
 pub struct SudoPayload {
     #[doc = " ICA is the message which carries the success responses"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub ica: ::core::option::Option<IcaSuccess>,
 }
 impl ::prost::Name for SudoPayload {
@@ -140,18 +128,10 @@ pub struct IcaSuccess {
     #[doc = " account_registered is the message which carries the success response after"]
     #[doc = " the ica account has been registered"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub account_registered: ::core::option::Option<AccountRegistered>,
     #[doc = " tx_executed is the message which carries the success response after the ica"]
     #[doc = " tx has been executed"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tx_executed: ::core::option::Option<TxExecuted>,
 }
 impl ::prost::Name for IcaSuccess {
@@ -186,10 +166,6 @@ impl ::prost::Name for AccountRegistered {
 pub struct TxExecuted {
     #[doc = " packet is the ibc packet which was executed"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub packet: ::core::option::Option<super::super::super::ibc::core::channel::v1::Packet>,
     #[doc = " data is the response data after the tx has been executed"]
     #[prost(bytes = "vec", tag = "2")]
@@ -240,17 +216,7 @@ impl ::prost::Name for MsgRegisterInterchainAccountResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgSendTx<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct MsgSendTx<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " contract_address is the address of the who wants to submit a transaction to"]
     #[doc = " the counterparty chain"]
     #[prost(string, tag = "1")]
@@ -260,11 +226,7 @@ pub struct MsgSendTx<
     pub connection_id: ::prost::alloc::string::String,
     #[doc = " msgs are the messages to be submitted to the counterparty chain"]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub msgs: ::prost::alloc::vec::Vec<A>,
+    pub msgs: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
     #[doc = " memo is the memo to be included in the packet"]
     #[prost(string, tag = "4")]
     pub memo: ::prost::alloc::string::String,
@@ -272,17 +234,8 @@ pub struct MsgSendTx<
     #[prost(uint64, tag = "5")]
     pub timeout: u64,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgSendTx<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgSendTx<A>
 {
     const NAME: &'static str = "MsgSendTx";
     const PACKAGE: &'static str = "archway.cwica.v1";
@@ -322,10 +275,6 @@ pub struct MsgUpdateParams {
     #[doc = " params deines the module parmeters to update"]
     #[doc = " NOTE: All parameters must be supplied."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for MsgUpdateParams {
diff --git a/packages/proto/src/gen/archway.genmsg.v1.abstract.rs b/packages/proto/src/gen/archway.genmsg.v1.abstract.rs
index 4b19a29..df33063 100644
--- a/packages/proto/src/gen/archway.genmsg.v1.abstract.rs
+++ b/packages/proto/src/gen/archway.genmsg.v1.abstract.rs
@@ -2,35 +2,13 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub messages: ::prost::alloc::vec::Vec<A>,
+    pub messages: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GenesisState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
     const PACKAGE: &'static str = "archway.genmsg.v1";
diff --git a/packages/proto/src/gen/cosmos.app.v1alpha1.abstract.rs b/packages/proto/src/gen/cosmos.app.v1alpha1.abstract.rs
index e7330f8..abfcef5 100644
--- a/packages/proto/src/gen/cosmos.app.v1alpha1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.app.v1alpha1.abstract.rs
@@ -13,10 +13,6 @@ pub struct ModuleDescriptor {
     #[doc = " or own a single protobuf package. It is assumed that the module uses"]
     #[doc = " all of the .proto files in a single package."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub use_package: ::prost::alloc::vec::Vec<PackageReference>,
     #[doc = " can_migrate_from defines which module versions this module can migrate"]
     #[doc = " state from. The framework will check that one module version is able to"]
@@ -26,10 +22,6 @@ pub struct ModuleDescriptor {
     #[doc = " declares it can migrate from v1, the framework knows how to migrate"]
     #[doc = " from v1 to v3, assuming all 3 module versions are registered at runtime."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub can_migrate_from: ::prost::alloc::vec::Vec<MigrateFromInfo>,
 }
 impl ::prost::Name for ModuleDescriptor {
@@ -120,45 +112,18 @@ impl ::prost::Name for MigrateFromInfo {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Config<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Config<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " modules are the module configurations for the app."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub modules: ::prost::alloc::vec::Vec<ModuleConfig<A>>,
     #[doc = " golang_bindings specifies explicit interface to implementation type bindings which"]
     #[doc = " depinject uses to resolve interface inputs to provider functions.  The scope of this"]
     #[doc = " field's configuration is global (not module specific)."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub golang_bindings: ::prost::alloc::vec::Vec<GolangBinding>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Config<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Config<A>
 {
     const NAME: &'static str = "Config";
     const PACKAGE: &'static str = "cosmos.app.v1alpha1";
@@ -170,17 +135,8 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ModuleConfig<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct ModuleConfig<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[doc = " name is the unique name of the module within the app. It should be a name"]
     #[doc = " that persists between different versions of a module so that modules"]
     #[doc = " can be smoothly upgraded to new versions."]
@@ -196,32 +152,15 @@ pub struct ModuleConfig<
     #[doc = " config is the config object for the module. Module config messages should"]
     #[doc = " define a ModuleDescriptor using the cosmos.app.v1alpha1.is_module extension."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub config: ::core::option::Option<A>,
+    pub config: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " golang_bindings specifies explicit interface to implementation type bindings which"]
     #[doc = " depinject uses to resolve interface inputs to provider functions.  The scope of this"]
     #[doc = " field's configuration is module specific."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub golang_bindings: ::prost::alloc::vec::Vec<GolangBinding>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ModuleConfig<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ModuleConfig<A>
 {
     const NAME: &'static str = "ModuleConfig";
     const PACKAGE: &'static str = "cosmos.app.v1alpha1";
@@ -265,35 +204,14 @@ impl ::prost::Name for QueryConfigRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryConfigResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " config is the current app config."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub config: ::core::option::Option<Config<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryConfigResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryConfigResponse<A>
 {
     const NAME: &'static str = "QueryConfigResponse";
     const PACKAGE: &'static str = "cosmos.app.v1alpha1";
diff --git a/packages/proto/src/gen/cosmos.auth.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.auth.v1beta1.abstract.rs
index 80a9a0a..e0a6743 100644
--- a/packages/proto/src/gen/cosmos.auth.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.auth.v1beta1.abstract.rs
@@ -4,41 +4,19 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct BaseAccount<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct BaseAccount<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[prost(string, tag = "1")]
     pub address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub pub_key: ::core::option::Option<A>,
+    pub pub_key: ::core::option::Option<crate::any::Any<A>>,
     #[prost(uint64, tag = "3")]
     pub account_number: u64,
     #[prost(uint64, tag = "4")]
     pub sequence: u64,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for BaseAccount<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for BaseAccount<A>
 {
     const NAME: &'static str = "BaseAccount";
     const PACKAGE: &'static str = "cosmos.auth.v1beta1";
@@ -51,38 +29,17 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ModuleAccount<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub base_account: ::core::option::Option<BaseAccount<A>>,
     #[prost(string, tag = "2")]
     pub name: ::prost::alloc::string::String,
     #[prost(string, repeated, tag = "3")]
     pub permissions: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ModuleAccount<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ModuleAccount<A>
 {
     const NAME: &'static str = "ModuleAccount";
     const PACKAGE: &'static str = "cosmos.auth.v1beta1";
@@ -139,43 +96,17 @@ impl ::prost::Name for Params {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[doc = " params defines all the parameters of the module."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
     #[doc = " accounts are the accounts present at genesis."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub accounts: ::prost::alloc::vec::Vec<A>,
+    pub accounts: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GenesisState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
     const PACKAGE: &'static str = "cosmos.auth.v1beta1";
@@ -192,10 +123,6 @@ impl<
 pub struct QueryAccountsRequest {
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryAccountsRequest {
@@ -212,42 +139,17 @@ impl ::prost::Name for QueryAccountsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryAccountsResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " accounts are the existing accounts"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub accounts: ::prost::alloc::vec::Vec<A>,
+    pub accounts: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryAccountsResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryAccountsResponse<A>
 {
     const NAME: &'static str = "QueryAccountsResponse";
     const PACKAGE: &'static str = "cosmos.auth.v1beta1";
@@ -276,35 +178,14 @@ impl ::prost::Name for QueryAccountRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryAccountResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " account defines the account of the corresponding address."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub account: ::core::option::Option<A>,
+    pub account: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryAccountResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryAccountResponse<A>
 {
     const NAME: &'static str = "QueryAccountResponse";
     const PACKAGE: &'static str = "cosmos.auth.v1beta1";
@@ -331,10 +212,6 @@ impl ::prost::Name for QueryParamsRequest {
 pub struct QueryParamsResponse {
     #[doc = " params defines the parameters of the module."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for QueryParamsResponse {
@@ -365,34 +242,13 @@ impl ::prost::Name for QueryModuleAccountsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryModuleAccountsResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub accounts: ::prost::alloc::vec::Vec<A>,
+    pub accounts: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryModuleAccountsResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryModuleAccountsResponse<A>
 {
     const NAME: &'static str = "QueryModuleAccountsResponse";
     const PACKAGE: &'static str = "cosmos.auth.v1beta1";
@@ -420,34 +276,13 @@ impl ::prost::Name for QueryModuleAccountByNameRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryModuleAccountByNameResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub account: ::core::option::Option<A>,
+    pub account: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryModuleAccountByNameResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryModuleAccountByNameResponse<A>
 {
     const NAME: &'static str = "QueryModuleAccountByNameResponse";
     const PACKAGE: &'static str = "cosmos.auth.v1beta1";
@@ -624,35 +459,14 @@ impl ::prost::Name for QueryAccountInfoRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryAccountInfoResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " info is the account info which is represented by BaseAccount."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub info: ::core::option::Option<BaseAccount<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryAccountInfoResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryAccountInfoResponse<A>
 {
     const NAME: &'static str = "QueryAccountInfoResponse";
     const PACKAGE: &'static str = "cosmos.auth.v1beta1";
@@ -674,10 +488,6 @@ pub struct MsgUpdateParams {
     #[doc = ""]
     #[doc = " NOTE: All parameters must be supplied."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for MsgUpdateParams {
diff --git a/packages/proto/src/gen/cosmos.authz.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.authz.v1beta1.abstract.rs
index a1c5e6a..181f948 100644
--- a/packages/proto/src/gen/cosmos.authz.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.authz.v1beta1.abstract.rs
@@ -20,40 +20,17 @@ impl ::prost::Name for GenericAuthorization {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Grant<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Grant<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub authorization: ::core::option::Option<A>,
+    pub authorization: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " time when the grant will expire and will be pruned. If null, then the grant"]
     #[doc = " doesn't have a time expiration (other conditions  in `authorization`"]
     #[doc = " may apply to invalidate the grant)"]
     #[prost(message, optional, tag = "2")]
     pub expiration: ::core::option::Option<::pbjson_types::Timestamp>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Grant<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Grant<A>
 {
     const NAME: &'static str = "Grant";
     const PACKAGE: &'static str = "cosmos.authz.v1beta1";
@@ -67,40 +44,19 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GrantAuthorization<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(string, tag = "1")]
     pub granter: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
     pub grantee: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub authorization: ::core::option::Option<A>,
+    pub authorization: ::core::option::Option<crate::any::Any<A>>,
     #[prost(message, optional, tag = "4")]
     pub expiration: ::core::option::Option<::pbjson_types::Timestamp>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GrantAuthorization<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GrantAuthorization<A>
 {
     const NAME: &'static str = "GrantAuthorization";
     const PACKAGE: &'static str = "cosmos.authz.v1beta1";
@@ -172,35 +128,13 @@ impl ::prost::Name for EventRevoke {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub authorization: ::prost::alloc::vec::Vec<GrantAuthorization<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GenesisState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
     const PACKAGE: &'static str = "cosmos.authz.v1beta1";
@@ -222,10 +156,6 @@ pub struct QueryGrantsRequest {
     pub msg_type_url: ::prost::alloc::string::String,
     #[doc = " pagination defines an pagination for the request."]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryGrantsRequest {
@@ -240,42 +170,17 @@ impl ::prost::Name for QueryGrantsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryGrantsResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " authorizations is a list of grants granted for grantee by granter."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub grants: ::prost::alloc::vec::Vec<Grant<A>>,
     #[doc = " pagination defines an pagination for the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryGrantsResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryGrantsResponse<A>
 {
     const NAME: &'static str = "QueryGrantsResponse";
     const PACKAGE: &'static str = "cosmos.authz.v1beta1";
@@ -292,10 +197,6 @@ pub struct QueryGranterGrantsRequest {
     pub granter: ::prost::alloc::string::String,
     #[doc = " pagination defines an pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryGranterGrantsRequest {
@@ -310,42 +211,17 @@ impl ::prost::Name for QueryGranterGrantsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryGranterGrantsResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " grants is a list of grants granted by the granter."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub grants: ::prost::alloc::vec::Vec<GrantAuthorization<A>>,
     #[doc = " pagination defines an pagination for the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryGranterGrantsResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryGranterGrantsResponse<A>
 {
     const NAME: &'static str = "QueryGranterGrantsResponse";
     const PACKAGE: &'static str = "cosmos.authz.v1beta1";
@@ -362,10 +238,6 @@ pub struct QueryGranteeGrantsRequest {
     pub grantee: ::prost::alloc::string::String,
     #[doc = " pagination defines an pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryGranteeGrantsRequest {
@@ -380,42 +252,17 @@ impl ::prost::Name for QueryGranteeGrantsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryGranteeGrantsResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " grants is a list of grants granted to the grantee."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub grants: ::prost::alloc::vec::Vec<GrantAuthorization<A>>,
     #[doc = " pagination defines an pagination for the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryGranteeGrantsResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryGranteeGrantsResponse<A>
 {
     const NAME: &'static str = "QueryGranteeGrantsResponse";
     const PACKAGE: &'static str = "cosmos.authz.v1beta1";
@@ -428,39 +275,16 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgGrant<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct MsgGrant<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[prost(string, tag = "1")]
     pub granter: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
     pub grantee: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub grant: ::core::option::Option<Grant<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgGrant<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgGrant<A>
 {
     const NAME: &'static str = "MsgGrant";
     const PACKAGE: &'static str = "cosmos.authz.v1beta1";
@@ -489,40 +313,17 @@ impl ::prost::Name for MsgExecResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgExec<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct MsgExec<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[prost(string, tag = "1")]
     pub grantee: ::prost::alloc::string::String,
     #[doc = " Execute Msg."]
     #[doc = " The x/authz will try to find a grant matching (msg.signers\\[0\\], grantee, MsgTypeURL(msg))"]
     #[doc = " triple and validate it."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub msgs: ::prost::alloc::vec::Vec<A>,
+    pub msgs: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgExec<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgExec<A>
 {
     const NAME: &'static str = "MsgExec";
     const PACKAGE: &'static str = "cosmos.authz.v1beta1";
diff --git a/packages/proto/src/gen/cosmos.base.abci.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.base.abci.v1beta1.abstract.rs
index cf472ab..1af5cda 100644
--- a/packages/proto/src/gen/cosmos.base.abci.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.base.abci.v1beta1.abstract.rs
@@ -3,17 +3,7 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct TxResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct TxResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " The block height"]
     #[prost(int64, tag = "1")]
     pub height: i64,
@@ -35,10 +25,6 @@ pub struct TxResponse<
     pub raw_log: ::prost::alloc::string::String,
     #[doc = " The output of the application's logger (typed). May be non-deterministic."]
     #[prost(message, repeated, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub logs: ::prost::alloc::vec::Vec<AbciMessageLog>,
     #[doc = " Additional information. May be non-deterministic."]
     #[prost(string, tag = "8")]
@@ -51,11 +37,7 @@ pub struct TxResponse<
     pub gas_used: i64,
     #[doc = " The request transaction bytes."]
     #[prost(message, optional, tag = "11")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub tx: ::core::option::Option<A>,
+    pub tx: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " Time of the previous block. For heights > 1, it's the weighted median of"]
     #[doc = " the timestamps of the valid votes in the block.LastCommit. For height == 1,"]
     #[doc = " it's genesis time."]
@@ -70,17 +52,8 @@ pub struct TxResponse<
     #[prost(message, repeated, tag = "13")]
     pub events: ::prost::alloc::vec::Vec<::tendermint_proto::v0_37::abci::Event>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for TxResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for TxResponse<A>
 {
     const NAME: &'static str = "TxResponse";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
@@ -100,10 +73,6 @@ pub struct AbciMessageLog {
     #[doc = " Events contains a slice of Event objects that were emitted during some"]
     #[doc = " execution."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub events: ::prost::alloc::vec::Vec<StringEvent>,
 }
 impl ::prost::Name for AbciMessageLog {
@@ -122,10 +91,6 @@ pub struct StringEvent {
     #[prost(string, tag = "1")]
     pub r#type: ::prost::alloc::string::String,
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub attributes: ::prost::alloc::vec::Vec<Attribute>,
 }
 impl ::prost::Name for StringEvent {
@@ -176,17 +141,7 @@ impl ::prost::Name for GasInfo {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Result<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Result<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " Data is any data returned from message or handler execution. It MUST be"]
     #[doc = " length prefixed in order to separate data from multiple message executions."]
     #[doc = " Deprecated. This field is still populated, but prefer msg_response instead"]
@@ -205,23 +160,10 @@ pub struct Result<
     #[doc = ""]
     #[doc = " Since: cosmos-sdk 0.46"]
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub msg_responses: ::prost::alloc::vec::Vec<A>,
+    pub msg_responses: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Result<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Result<A>
 {
     const NAME: &'static str = "Result";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
@@ -235,40 +177,15 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct SimulationResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub gas_info: ::core::option::Option<GasInfo>,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub result: ::core::option::Option<Result<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for SimulationResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for SimulationResponse<A>
 {
     const NAME: &'static str = "SimulationResponse";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
@@ -299,46 +216,19 @@ impl ::prost::Name for MsgData {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct TxMsgData<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct TxMsgData<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " data field is deprecated and not populated."]
     #[deprecated]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub data: ::prost::alloc::vec::Vec<MsgData>,
     #[doc = " msg_responses contains the Msg handler responses packed into Anys."]
     #[doc = ""]
     #[doc = " Since: cosmos-sdk 0.46"]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub msg_responses: ::prost::alloc::vec::Vec<A>,
+    pub msg_responses: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for TxMsgData<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for TxMsgData<A>
 {
     const NAME: &'static str = "TxMsgData";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
@@ -351,15 +241,7 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct SearchTxsResult<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " Count of all txs"]
     #[prost(uint64, tag = "1")]
@@ -378,23 +260,10 @@ pub struct SearchTxsResult<
     pub limit: u64,
     #[doc = " List of txs in current page"]
     #[prost(message, repeated, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub txs: ::prost::alloc::vec::Vec<TxResponse<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for SearchTxsResult<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for SearchTxsResult<A>
 {
     const NAME: &'static str = "SearchTxsResult";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
diff --git a/packages/proto/src/gen/cosmos.base.tendermint.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.base.tendermint.v1beta1.abstract.rs
index 1916da1..20230e9 100644
--- a/packages/proto/src/gen/cosmos.base.tendermint.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.base.tendermint.v1beta1.abstract.rs
@@ -5,10 +5,6 @@
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct Block {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub header: ::core::option::Option<Header>,
     #[prost(message, optional, tag = "2")]
     pub data: ::core::option::Option<::tendermint_proto::v0_37::types::Data>,
@@ -95,10 +91,6 @@ pub struct GetValidatorSetByHeightRequest {
     pub height: i64,
     #[doc = " pagination defines an pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for GetValidatorSetByHeightRequest {
@@ -113,43 +105,18 @@ impl ::prost::Name for GetValidatorSetByHeightRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GetValidatorSetByHeightResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(int64, tag = "1")]
     pub block_height: i64,
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub validators: ::prost::alloc::vec::Vec<Validator<A>>,
     #[doc = " pagination defines an pagination for the response."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GetValidatorSetByHeightResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GetValidatorSetByHeightResponse<A>
 {
     const NAME: &'static str = "GetValidatorSetByHeightResponse";
     const PACKAGE: &'static str = "cosmos.base.tendermint.v1beta1";
@@ -164,10 +131,6 @@ impl<
 pub struct GetLatestValidatorSetRequest {
     #[doc = " pagination defines an pagination for the request."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for GetLatestValidatorSetRequest {
@@ -182,43 +145,18 @@ impl ::prost::Name for GetLatestValidatorSetRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GetLatestValidatorSetResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(int64, tag = "1")]
     pub block_height: i64,
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub validators: ::prost::alloc::vec::Vec<Validator<A>>,
     #[doc = " pagination defines an pagination for the response."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GetLatestValidatorSetResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GetLatestValidatorSetResponse<A>
 {
     const NAME: &'static str = "GetLatestValidatorSetResponse";
     const PACKAGE: &'static str = "cosmos.base.tendermint.v1beta1";
@@ -230,41 +168,18 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Validator<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Validator<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[prost(string, tag = "1")]
     pub address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub pub_key: ::core::option::Option<A>,
+    pub pub_key: ::core::option::Option<crate::any::Any<A>>,
     #[prost(int64, tag = "3")]
     pub voting_power: i64,
     #[prost(int64, tag = "4")]
     pub proposer_priority: i64,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Validator<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Validator<A>
 {
     const NAME: &'static str = "Validator";
     const PACKAGE: &'static str = "cosmos.base.tendermint.v1beta1";
@@ -296,17 +211,9 @@ pub struct GetBlockByHeightResponse {
     pub block_id: ::core::option::Option<::tendermint_proto::v0_37::types::BlockId>,
     #[doc = " Deprecated: please use `sdk_block` instead"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub block: ::core::option::Option<::tendermint_proto::v0_37::types::Block>,
     #[doc = " Since: cosmos-sdk 0.47"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub sdk_block: ::core::option::Option<Block>,
 }
 impl ::prost::Name for GetBlockByHeightResponse {
@@ -337,17 +244,9 @@ pub struct GetLatestBlockResponse {
     pub block_id: ::core::option::Option<::tendermint_proto::v0_37::types::BlockId>,
     #[doc = " Deprecated: please use `sdk_block` instead"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub block: ::core::option::Option<::tendermint_proto::v0_37::types::Block>,
     #[doc = " Since: cosmos-sdk 0.47"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub sdk_block: ::core::option::Option<Block>,
 }
 impl ::prost::Name for GetLatestBlockResponse {
@@ -404,10 +303,6 @@ pub struct GetNodeInfoResponse {
     #[prost(message, optional, tag = "1")]
     pub default_node_info: ::core::option::Option<::tendermint_proto::v0_37::p2p::DefaultNodeInfo>,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub application_version: ::core::option::Option<VersionInfo>,
 }
 impl ::prost::Name for GetNodeInfoResponse {
@@ -435,10 +330,6 @@ pub struct VersionInfo {
     #[prost(string, tag = "6")]
     pub go_version: ::prost::alloc::string::String,
     #[prost(message, repeated, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub build_deps: ::prost::alloc::vec::Vec<Module>,
     #[doc = " Since: cosmos-sdk 0.43"]
     #[prost(string, tag = "8")]
@@ -517,10 +408,6 @@ pub struct AbciQueryResponse {
     #[prost(bytes = "vec", tag = "7")]
     pub value: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "8")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_ops: ::core::option::Option<ProofOps>,
     #[prost(int64, tag = "9")]
     pub height: i64,
@@ -565,10 +452,6 @@ impl ::prost::Name for ProofOp {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ProofOps {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub ops: ::prost::alloc::vec::Vec<ProofOp>,
 }
 impl ::prost::Name for ProofOps {
diff --git a/packages/proto/src/gen/cosmos.crypto.keyring.v1.abstract.rs b/packages/proto/src/gen/cosmos.crypto.keyring.v1.abstract.rs
index 41fb94b..201ac07 100644
--- a/packages/proto/src/gen/cosmos.crypto.keyring.v1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.crypto.keyring.v1.abstract.rs
@@ -2,27 +2,13 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Record<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Record<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " name represents a name of Record"]
     #[prost(string, tag = "1")]
     pub name: ::prost::alloc::string::String,
     #[doc = " pub_key represents a public key in any format"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub pub_key: ::core::option::Option<A>,
+    pub pub_key: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " Record contains one of the following items"]
     #[prost(oneof = "record::Item", tags = "3, 4, 5, 6")]
     pub item: ::core::option::Option<record::Item>,
@@ -103,17 +89,8 @@ pub mod record {
         Offline(Offline),
     }
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Record<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Record<A>
 {
     const NAME: &'static str = "Record";
     const PACKAGE: &'static str = "cosmos.crypto.keyring.v1";
diff --git a/packages/proto/src/gen/cosmos.crypto.multisig.abstract.rs b/packages/proto/src/gen/cosmos.crypto.multisig.abstract.rs
index ee92cbf..421deed 100644
--- a/packages/proto/src/gen/cosmos.crypto.multisig.abstract.rs
+++ b/packages/proto/src/gen/cosmos.crypto.multisig.abstract.rs
@@ -5,36 +5,15 @@
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct LegacyAminoPubKey<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(uint32, tag = "1")]
     pub threshold: u32,
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub public_keys: ::prost::alloc::vec::Vec<A>,
+    pub public_keys: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for LegacyAminoPubKey<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for LegacyAminoPubKey<A>
 {
     const NAME: &'static str = "LegacyAminoPubKey";
     const PACKAGE: &'static str = "cosmos.crypto.multisig";
diff --git a/packages/proto/src/gen/cosmos.evidence.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.evidence.v1beta1.abstract.rs
index fa0da0d..0fbe715 100644
--- a/packages/proto/src/gen/cosmos.evidence.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.evidence.v1beta1.abstract.rs
@@ -28,36 +28,14 @@ impl ::prost::Name for Equivocation {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[doc = " evidence defines all the evidence at genesis."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub evidence: ::prost::alloc::vec::Vec<A>,
+    pub evidence: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GenesisState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
     const PACKAGE: &'static str = "cosmos.evidence.v1beta1";
@@ -93,35 +71,14 @@ impl ::prost::Name for QueryEvidenceRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryEvidenceResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " evidence returns the requested evidence."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub evidence: ::core::option::Option<A>,
+    pub evidence: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryEvidenceResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryEvidenceResponse<A>
 {
     const NAME: &'static str = "QueryEvidenceResponse";
     const PACKAGE: &'static str = "cosmos.evidence.v1beta1";
@@ -137,10 +94,6 @@ impl<
 pub struct QueryAllEvidenceRequest {
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryAllEvidenceRequest {
@@ -156,42 +109,17 @@ impl ::prost::Name for QueryAllEvidenceRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryAllEvidenceResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " evidence returns all evidences."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub evidence: ::prost::alloc::vec::Vec<A>,
+    pub evidence: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryAllEvidenceResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryAllEvidenceResponse<A>
 {
     const NAME: &'static str = "QueryAllEvidenceResponse";
     const PACKAGE: &'static str = "cosmos.evidence.v1beta1";
@@ -205,38 +133,17 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgSubmitEvidence<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " submitter is the signer account address of evidence."]
     #[prost(string, tag = "1")]
     pub submitter: ::prost::alloc::string::String,
     #[doc = " evidence defines the evidence of misbehavior."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub evidence: ::core::option::Option<A>,
+    pub evidence: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgSubmitEvidence<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgSubmitEvidence<A>
 {
     const NAME: &'static str = "MsgSubmitEvidence";
     const PACKAGE: &'static str = "cosmos.evidence.v1beta1";
diff --git a/packages/proto/src/gen/cosmos.feegrant.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.feegrant.v1beta1.abstract.rs
index a4dc8d6..5c3782e 100644
--- a/packages/proto/src/gen/cosmos.feegrant.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.feegrant.v1beta1.abstract.rs
@@ -8,10 +8,6 @@ pub struct BasicAllowance {
     #[doc = " by this allowance and will be updated as coins are spent. If it is"]
     #[doc = " empty, there is no spend limit and any amount of coins can be spent."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub spend_limit: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " expiration specifies an optional time when this allowance expires"]
     #[prost(message, optional, tag = "2")]
@@ -32,10 +28,6 @@ impl ::prost::Name for BasicAllowance {
 pub struct PeriodicAllowance {
     #[doc = " basic specifies a struct of `BasicAllowance`"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub basic: ::core::option::Option<BasicAllowance>,
     #[doc = " period specifies the time duration in which period_spend_limit coins can"]
     #[doc = " be spent before that allowance is reset"]
@@ -44,17 +36,9 @@ pub struct PeriodicAllowance {
     #[doc = " period_spend_limit specifies the maximum number of coins that can be spent"]
     #[doc = " in the period"]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub period_spend_limit: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " period_can_spend is the number of coins left to be spent before the period_reset time"]
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub period_can_spend: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " period_reset is the time at which this period resets and a new one begins,"]
     #[doc = " it is calculated from the start time of the first transaction after the"]
@@ -74,38 +58,17 @@ impl ::prost::Name for PeriodicAllowance {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct AllowedMsgAllowance<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " allowance can be any of basic and periodic fee allowance."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub allowance: ::core::option::Option<A>,
+    pub allowance: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " allowed_messages are the messages for which the grantee has the access."]
     #[prost(string, repeated, tag = "2")]
     pub allowed_messages: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for AllowedMsgAllowance<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for AllowedMsgAllowance<A>
 {
     const NAME: &'static str = "AllowedMsgAllowance";
     const PACKAGE: &'static str = "cosmos.feegrant.v1beta1";
@@ -117,17 +80,7 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Grant<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Grant<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " granter is the address of the user granting an allowance of their funds."]
     #[prost(string, tag = "1")]
     pub granter: ::prost::alloc::string::String,
@@ -136,23 +89,10 @@ pub struct Grant<
     pub grantee: ::prost::alloc::string::String,
     #[doc = " allowance can be any of basic, periodic, allowed fee allowance."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub allowance: ::core::option::Option<A>,
+    pub allowance: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Grant<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Grant<A>
 {
     const NAME: &'static str = "Grant";
     const PACKAGE: &'static str = "cosmos.feegrant.v1beta1";
@@ -164,35 +104,13 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub allowances: ::prost::alloc::vec::Vec<Grant<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GenesisState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
     const PACKAGE: &'static str = "cosmos.feegrant.v1beta1";
@@ -224,35 +142,14 @@ impl ::prost::Name for QueryAllowanceRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryAllowanceResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " allowance is a allowance granted for grantee by granter."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub allowance: ::core::option::Option<Grant<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryAllowanceResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryAllowanceResponse<A>
 {
     const NAME: &'static str = "QueryAllowanceResponse";
     const PACKAGE: &'static str = "cosmos.feegrant.v1beta1";
@@ -269,10 +166,6 @@ pub struct QueryAllowancesRequest {
     pub grantee: ::prost::alloc::string::String,
     #[doc = " pagination defines an pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryAllowancesRequest {
@@ -287,42 +180,17 @@ impl ::prost::Name for QueryAllowancesRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryAllowancesResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " allowances are allowance's granted for grantee by granter."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub allowances: ::prost::alloc::vec::Vec<Grant<A>>,
     #[doc = " pagination defines an pagination for the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryAllowancesResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryAllowancesResponse<A>
 {
     const NAME: &'static str = "QueryAllowancesResponse";
     const PACKAGE: &'static str = "cosmos.feegrant.v1beta1";
@@ -341,10 +209,6 @@ pub struct QueryAllowancesByGranterRequest {
     pub granter: ::prost::alloc::string::String,
     #[doc = " pagination defines an pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryAllowancesByGranterRequest {
@@ -361,42 +225,17 @@ impl ::prost::Name for QueryAllowancesByGranterRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryAllowancesByGranterResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " allowances that have been issued by the granter."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub allowances: ::prost::alloc::vec::Vec<Grant<A>>,
     #[doc = " pagination defines an pagination for the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryAllowancesByGranterResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryAllowancesByGranterResponse<A>
 {
     const NAME: &'static str = "QueryAllowancesByGranterResponse";
     const PACKAGE: &'static str = "cosmos.feegrant.v1beta1";
@@ -410,15 +249,7 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgGrantAllowance<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " granter is the address of the user granting an allowance of their funds."]
     #[prost(string, tag = "1")]
@@ -428,23 +259,10 @@ pub struct MsgGrantAllowance<
     pub grantee: ::prost::alloc::string::String,
     #[doc = " allowance can be any of basic, periodic, allowed fee allowance."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub allowance: ::core::option::Option<A>,
+    pub allowance: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgGrantAllowance<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgGrantAllowance<A>
 {
     const NAME: &'static str = "MsgGrantAllowance";
     const PACKAGE: &'static str = "cosmos.feegrant.v1beta1";
diff --git a/packages/proto/src/gen/cosmos.gov.v1.abstract.rs b/packages/proto/src/gen/cosmos.gov.v1.abstract.rs
index 0a278e7..5ae1005 100644
--- a/packages/proto/src/gen/cosmos.gov.v1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.gov.v1.abstract.rs
@@ -31,10 +31,6 @@ pub struct Deposit {
     pub depositor: ::prost::alloc::string::String,
     #[doc = " amount to be deposited by depositor."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub amount: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
 }
 impl ::prost::Name for Deposit {
@@ -48,27 +44,13 @@ impl ::prost::Name for Deposit {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Proposal<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Proposal<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " id defines the unique id of the proposal."]
     #[prost(uint64, tag = "1")]
     pub id: u64,
     #[doc = " messages are the arbitrary messages to be executed if the proposal passes."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub messages: ::prost::alloc::vec::Vec<A>,
+    pub messages: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
     #[doc = " status defines the proposal status."]
     #[prost(enumeration = "ProposalStatus", tag = "3")]
     pub status: i32,
@@ -76,10 +58,6 @@ pub struct Proposal<
     #[doc = " querying a proposal via gRPC, this field is not populated until the"]
     #[doc = " proposal's voting period has ended."]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub final_tally_result: ::core::option::Option<TallyResult>,
     #[doc = " submit_time is the time of proposal submission."]
     #[prost(message, optional, tag = "5")]
@@ -89,10 +67,6 @@ pub struct Proposal<
     pub deposit_end_time: ::core::option::Option<::pbjson_types::Timestamp>,
     #[doc = " total_deposit is the total deposit on the proposal."]
     #[prost(message, repeated, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub total_deposit: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " voting_start_time is the starting time to vote on a proposal."]
     #[prost(message, optional, tag = "8")]
@@ -119,17 +93,8 @@ pub struct Proposal<
     #[prost(string, tag = "13")]
     pub proposer: ::prost::alloc::string::String,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Proposal<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Proposal<A>
 {
     const NAME: &'static str = "Proposal";
     const PACKAGE: &'static str = "cosmos.gov.v1";
@@ -176,10 +141,6 @@ pub struct Vote {
     pub voter: ::prost::alloc::string::String,
     #[doc = " options is the weighted vote options."]
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub options: ::prost::alloc::vec::Vec<WeightedVoteOption>,
     #[doc = " metadata is any  arbitrary metadata to attached to the vote."]
     #[prost(string, tag = "5")]
@@ -199,10 +160,6 @@ impl ::prost::Name for Vote {
 pub struct DepositParams {
     #[doc = " Minimum deposit for a proposal to enter voting period."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub min_deposit: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " Maximum period for Atom holders to deposit on a proposal. Initial value: 2"]
     #[doc = " months."]
@@ -265,10 +222,6 @@ impl ::prost::Name for TallyParams {
 pub struct Params {
     #[doc = " Minimum deposit for a proposal to enter voting period."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub min_deposit: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " Maximum period for Atom holders to deposit on a proposal. Initial value: 2"]
     #[doc = " months."]
@@ -427,89 +380,43 @@ impl ProposalStatus {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[doc = " starting_proposal_id is the ID of the starting proposal."]
     #[prost(uint64, tag = "1")]
     pub starting_proposal_id: u64,
     #[doc = " deposits defines all the deposits present at genesis."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub deposits: ::prost::alloc::vec::Vec<Deposit>,
     #[doc = " votes defines all the votes present at genesis."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub votes: ::prost::alloc::vec::Vec<Vote>,
     #[doc = " proposals defines all the proposals present at genesis."]
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub proposals: ::prost::alloc::vec::Vec<Proposal<A>>,
     #[doc = " Deprecated: Prefer to use `params` instead."]
     #[doc = " deposit_params defines all the paramaters of related to deposit."]
     #[deprecated]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub deposit_params: ::core::option::Option<DepositParams>,
     #[doc = " Deprecated: Prefer to use `params` instead."]
     #[doc = " voting_params defines all the paramaters of related to voting."]
     #[deprecated]
     #[prost(message, optional, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub voting_params: ::core::option::Option<VotingParams>,
     #[doc = " Deprecated: Prefer to use `params` instead."]
     #[doc = " tally_params defines all the paramaters of related to tally."]
     #[deprecated]
     #[prost(message, optional, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tally_params: ::core::option::Option<TallyParams>,
     #[doc = " params defines all the paramaters of x/gov module."]
     #[doc = ""]
     #[doc = " Since: cosmos-sdk 0.47"]
     #[prost(message, optional, tag = "8")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GenesisState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
     const PACKAGE: &'static str = "cosmos.gov.v1";
@@ -538,35 +445,14 @@ impl ::prost::Name for QueryProposalRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryProposalResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " proposal is the requested governance proposal."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proposal: ::core::option::Option<Proposal<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryProposalResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryProposalResponse<A>
 {
     const NAME: &'static str = "QueryProposalResponse";
     const PACKAGE: &'static str = "cosmos.gov.v1";
@@ -590,10 +476,6 @@ pub struct QueryProposalsRequest {
     pub depositor: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryProposalsRequest {
@@ -609,42 +491,17 @@ impl ::prost::Name for QueryProposalsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryProposalsResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " proposals defines all the requested governance proposals."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub proposals: ::prost::alloc::vec::Vec<Proposal<A>>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryProposalsResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryProposalsResponse<A>
 {
     const NAME: &'static str = "QueryProposalsResponse";
     const PACKAGE: &'static str = "cosmos.gov.v1";
@@ -678,10 +535,6 @@ impl ::prost::Name for QueryVoteRequest {
 pub struct QueryVoteResponse {
     #[doc = " vote defines the queried vote."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub vote: ::core::option::Option<Vote>,
 }
 impl ::prost::Name for QueryVoteResponse {
@@ -701,10 +554,6 @@ pub struct QueryVotesRequest {
     pub proposal_id: u64,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryVotesRequest {
@@ -721,17 +570,9 @@ impl ::prost::Name for QueryVotesRequest {
 pub struct QueryVotesResponse {
     #[doc = " votes defines the queried votes."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub votes: ::prost::alloc::vec::Vec<Vote>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryVotesResponse {
@@ -767,37 +608,21 @@ pub struct QueryParamsResponse {
     #[doc = " voting_params defines the parameters related to voting."]
     #[deprecated]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub voting_params: ::core::option::Option<VotingParams>,
     #[doc = " Deprecated: Prefer to use `params` instead."]
     #[doc = " deposit_params defines the parameters related to deposit."]
     #[deprecated]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub deposit_params: ::core::option::Option<DepositParams>,
     #[doc = " Deprecated: Prefer to use `params` instead."]
     #[doc = " tally_params defines the parameters related to tally."]
     #[deprecated]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tally_params: ::core::option::Option<TallyParams>,
     #[doc = " params defines all the paramaters of x/gov module."]
     #[doc = ""]
     #[doc = " Since: cosmos-sdk 0.47"]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for QueryParamsResponse {
@@ -833,10 +658,6 @@ impl ::prost::Name for QueryDepositRequest {
 pub struct QueryDepositResponse {
     #[doc = " deposit defines the requested deposit."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub deposit: ::core::option::Option<Deposit>,
 }
 impl ::prost::Name for QueryDepositResponse {
@@ -856,10 +677,6 @@ pub struct QueryDepositsRequest {
     pub proposal_id: u64,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryDepositsRequest {
@@ -876,17 +693,9 @@ impl ::prost::Name for QueryDepositsRequest {
 pub struct QueryDepositsResponse {
     #[doc = " deposits defines the requested deposits."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub deposits: ::prost::alloc::vec::Vec<Deposit>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryDepositsResponse {
@@ -919,10 +728,6 @@ impl ::prost::Name for QueryTallyResultRequest {
 pub struct QueryTallyResultResponse {
     #[doc = " tally defines the requested tally."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tally: ::core::option::Option<TallyResult>,
 }
 impl ::prost::Name for QueryTallyResultResponse {
@@ -938,29 +743,13 @@ impl ::prost::Name for QueryTallyResultResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgSubmitProposal<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " messages are the arbitrary messages to be executed if proposal passes."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub messages: ::prost::alloc::vec::Vec<A>,
+    pub messages: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
     #[doc = " initial_deposit is the deposit value that must be paid at proposal submission."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub initial_deposit: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " proposer is the account address of the proposer."]
     #[prost(string, tag = "3")]
@@ -979,17 +768,8 @@ pub struct MsgSubmitProposal<
     #[prost(string, tag = "6")]
     pub summary: ::prost::alloc::string::String,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgSubmitProposal<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgSubmitProposal<A>
 {
     const NAME: &'static str = "MsgSubmitProposal";
     const PACKAGE: &'static str = "cosmos.gov.v1";
@@ -1019,38 +799,17 @@ impl ::prost::Name for MsgSubmitProposalResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgExecLegacyContent<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " content is the proposal's content."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub content: ::core::option::Option<A>,
+    pub content: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " authority must be the gov module address."]
     #[prost(string, tag = "2")]
     pub authority: ::prost::alloc::string::String,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgExecLegacyContent<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgExecLegacyContent<A>
 {
     const NAME: &'static str = "MsgExecLegacyContent";
     const PACKAGE: &'static str = "cosmos.gov.v1";
@@ -1120,10 +879,6 @@ pub struct MsgVoteWeighted {
     pub voter: ::prost::alloc::string::String,
     #[doc = " options defines the weighted vote options."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub options: ::prost::alloc::vec::Vec<WeightedVoteOption>,
     #[doc = " metadata is any arbitrary metadata attached to the VoteWeighted."]
     #[prost(string, tag = "4")]
@@ -1161,10 +916,6 @@ pub struct MsgDeposit {
     pub depositor: ::prost::alloc::string::String,
     #[doc = " amount to be deposited by depositor."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub amount: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
 }
 impl ::prost::Name for MsgDeposit {
@@ -1200,10 +951,6 @@ pub struct MsgUpdateParams {
     #[doc = ""]
     #[doc = " NOTE: All parameters must be supplied."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for MsgUpdateParams {
diff --git a/packages/proto/src/gen/cosmos.gov.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.gov.v1beta1.abstract.rs
index f625ba6..2f5c858 100644
--- a/packages/proto/src/gen/cosmos.gov.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.gov.v1beta1.abstract.rs
@@ -53,10 +53,6 @@ pub struct Deposit {
     pub depositor: ::prost::alloc::string::String,
     #[doc = " amount to be deposited by depositor."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub amount: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
 }
 impl ::prost::Name for Deposit {
@@ -70,27 +66,13 @@ impl ::prost::Name for Deposit {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Proposal<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Proposal<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " proposal_id defines the unique id of the proposal."]
     #[prost(uint64, tag = "1")]
     pub proposal_id: u64,
     #[doc = " content is the proposal's content."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub content: ::core::option::Option<A>,
+    pub content: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " status defines the proposal status."]
     #[prost(enumeration = "ProposalStatus", tag = "3")]
     pub status: i32,
@@ -98,10 +80,6 @@ pub struct Proposal<
     #[doc = " querying a proposal via gRPC, this field is not populated until the"]
     #[doc = " proposal's voting period has ended."]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub final_tally_result: ::core::option::Option<TallyResult>,
     #[doc = " submit_time is the time of proposal submission."]
     #[prost(message, optional, tag = "5")]
@@ -111,10 +89,6 @@ pub struct Proposal<
     pub deposit_end_time: ::core::option::Option<::pbjson_types::Timestamp>,
     #[doc = " total_deposit is the total deposit on the proposal."]
     #[prost(message, repeated, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub total_deposit: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " voting_start_time is the starting time to vote on a proposal."]
     #[prost(message, optional, tag = "8")]
@@ -123,17 +97,8 @@ pub struct Proposal<
     #[prost(message, optional, tag = "9")]
     pub voting_end_time: ::core::option::Option<::pbjson_types::Timestamp>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Proposal<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Proposal<A>
 {
     const NAME: &'static str = "Proposal";
     const PACKAGE: &'static str = "cosmos.gov.v1beta1";
@@ -188,10 +153,6 @@ pub struct Vote {
     #[doc = ""]
     #[doc = " Since: cosmos-sdk 0.43"]
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub options: ::prost::alloc::vec::Vec<WeightedVoteOption>,
 }
 impl ::prost::Name for Vote {
@@ -208,10 +169,6 @@ impl ::prost::Name for Vote {
 pub struct DepositParams {
     #[doc = " Minimum deposit for a proposal to enter voting period."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub min_deposit: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " Maximum period for Atom holders to deposit on a proposal. Initial value: 2"]
     #[doc = " months."]
@@ -384,74 +341,32 @@ impl ProposalStatus {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[doc = " starting_proposal_id is the ID of the starting proposal."]
     #[prost(uint64, tag = "1")]
     pub starting_proposal_id: u64,
     #[doc = " deposits defines all the deposits present at genesis."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub deposits: ::prost::alloc::vec::Vec<Deposit>,
     #[doc = " votes defines all the votes present at genesis."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub votes: ::prost::alloc::vec::Vec<Vote>,
     #[doc = " proposals defines all the proposals present at genesis."]
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub proposals: ::prost::alloc::vec::Vec<Proposal<A>>,
     #[doc = " params defines all the parameters of related to deposit."]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub deposit_params: ::core::option::Option<DepositParams>,
     #[doc = " params defines all the parameters of related to voting."]
     #[prost(message, optional, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub voting_params: ::core::option::Option<VotingParams>,
     #[doc = " params defines all the parameters of related to tally."]
     #[prost(message, optional, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tally_params: ::core::option::Option<TallyParams>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GenesisState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
     const PACKAGE: &'static str = "cosmos.gov.v1beta1";
@@ -480,34 +395,13 @@ impl ::prost::Name for QueryProposalRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryProposalResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proposal: ::core::option::Option<Proposal<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryProposalResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryProposalResponse<A>
 {
     const NAME: &'static str = "QueryProposalResponse";
     const PACKAGE: &'static str = "cosmos.gov.v1beta1";
@@ -531,10 +425,6 @@ pub struct QueryProposalsRequest {
     pub depositor: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryProposalsRequest {
@@ -550,42 +440,17 @@ impl ::prost::Name for QueryProposalsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryProposalsResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " proposals defines all the requested governance proposals."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub proposals: ::prost::alloc::vec::Vec<Proposal<A>>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryProposalsResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryProposalsResponse<A>
 {
     const NAME: &'static str = "QueryProposalsResponse";
     const PACKAGE: &'static str = "cosmos.gov.v1beta1";
@@ -619,10 +484,6 @@ impl ::prost::Name for QueryVoteRequest {
 pub struct QueryVoteResponse {
     #[doc = " vote defines the queried vote."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub vote: ::core::option::Option<Vote>,
 }
 impl ::prost::Name for QueryVoteResponse {
@@ -642,10 +503,6 @@ pub struct QueryVotesRequest {
     pub proposal_id: u64,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryVotesRequest {
@@ -662,17 +519,9 @@ impl ::prost::Name for QueryVotesRequest {
 pub struct QueryVotesResponse {
     #[doc = " votes defines the queried votes."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub votes: ::prost::alloc::vec::Vec<Vote>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryVotesResponse {
@@ -706,24 +555,12 @@ impl ::prost::Name for QueryParamsRequest {
 pub struct QueryParamsResponse {
     #[doc = " voting_params defines the parameters related to voting."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub voting_params: ::core::option::Option<VotingParams>,
     #[doc = " deposit_params defines the parameters related to deposit."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub deposit_params: ::core::option::Option<DepositParams>,
     #[doc = " tally_params defines the parameters related to tally."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tally_params: ::core::option::Option<TallyParams>,
 }
 impl ::prost::Name for QueryParamsResponse {
@@ -759,10 +596,6 @@ impl ::prost::Name for QueryDepositRequest {
 pub struct QueryDepositResponse {
     #[doc = " deposit defines the requested deposit."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub deposit: ::core::option::Option<Deposit>,
 }
 impl ::prost::Name for QueryDepositResponse {
@@ -782,10 +615,6 @@ pub struct QueryDepositsRequest {
     pub proposal_id: u64,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryDepositsRequest {
@@ -802,17 +631,9 @@ impl ::prost::Name for QueryDepositsRequest {
 pub struct QueryDepositsResponse {
     #[doc = " deposits defines the requested deposits."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub deposits: ::prost::alloc::vec::Vec<Deposit>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryDepositsResponse {
@@ -845,10 +666,6 @@ impl ::prost::Name for QueryTallyResultRequest {
 pub struct QueryTallyResultResponse {
     #[doc = " tally defines the requested tally."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tally: ::core::option::Option<TallyResult>,
 }
 impl ::prost::Name for QueryTallyResultResponse {
@@ -864,45 +681,20 @@ impl ::prost::Name for QueryTallyResultResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgSubmitProposal<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " content is the proposal's content."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub content: ::core::option::Option<A>,
+    pub content: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " initial_deposit is the deposit value that must be paid at proposal submission."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub initial_deposit: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " proposer is the account address of the proposer."]
     #[prost(string, tag = "3")]
     pub proposer: ::prost::alloc::string::String,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgSubmitProposal<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgSubmitProposal<A>
 {
     const NAME: &'static str = "MsgSubmitProposal";
     const PACKAGE: &'static str = "cosmos.gov.v1beta1";
@@ -975,10 +767,6 @@ pub struct MsgVoteWeighted {
     pub voter: ::prost::alloc::string::String,
     #[doc = " options defines the weighted vote options. "]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub options: ::prost::alloc::vec::Vec<WeightedVoteOption>,
 }
 impl ::prost::Name for MsgVoteWeighted {
@@ -1015,10 +803,6 @@ pub struct MsgDeposit {
     pub depositor: ::prost::alloc::string::String,
     #[doc = " amount to be deposited by depositor."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub amount: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
 }
 impl ::prost::Name for MsgDeposit {
diff --git a/packages/proto/src/gen/cosmos.group.v1.abstract.rs b/packages/proto/src/gen/cosmos.group.v1.abstract.rs
index 5048c18..106249c 100644
--- a/packages/proto/src/gen/cosmos.group.v1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.group.v1.abstract.rs
@@ -64,10 +64,6 @@ pub struct ThresholdDecisionPolicy {
     pub threshold: ::prost::alloc::string::String,
     #[doc = " windows defines the different windows for voting and execution."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub windows: ::core::option::Option<DecisionPolicyWindows>,
 }
 impl ::prost::Name for ThresholdDecisionPolicy {
@@ -93,10 +89,6 @@ pub struct PercentageDecisionPolicy {
     pub percentage: ::prost::alloc::string::String,
     #[doc = " windows defines the different windows for voting and execution."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub windows: ::core::option::Option<DecisionPolicyWindows>,
 }
 impl ::prost::Name for PercentageDecisionPolicy {
@@ -180,10 +172,6 @@ pub struct GroupMember {
     pub group_id: u64,
     #[doc = " member is the member data."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub member: ::core::option::Option<Member>,
 }
 impl ::prost::Name for GroupMember {
@@ -198,15 +186,7 @@ impl ::prost::Name for GroupMember {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GroupPolicyInfo<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " address is the account address of group policy."]
     #[prost(string, tag = "1")]
@@ -228,26 +208,13 @@ pub struct GroupPolicyInfo<
     pub version: u64,
     #[doc = " decision_policy specifies the group policy's decision policy."]
     #[prost(message, optional, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub decision_policy: ::core::option::Option<A>,
+    pub decision_policy: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " created_at is a timestamp specifying when a group policy was created."]
     #[prost(message, optional, tag = "7")]
     pub created_at: ::core::option::Option<::pbjson_types::Timestamp>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GroupPolicyInfo<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GroupPolicyInfo<A>
 {
     const NAME: &'static str = "GroupPolicyInfo";
     const PACKAGE: &'static str = "cosmos.group.v1";
@@ -262,17 +229,7 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Proposal<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Proposal<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " id is the unique id of the proposal."]
     #[prost(uint64, tag = "1")]
     pub id: u64,
@@ -308,10 +265,6 @@ pub struct Proposal<
     #[doc = " populated after tallying, at voting period end or at proposal execution,"]
     #[doc = " whichever happens first."]
     #[prost(message, optional, tag = "9")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub final_tally_result: ::core::option::Option<TallyResult>,
     #[doc = " voting_period_end is the timestamp before which voting must be done."]
     #[doc = " Unless a successful MsgExec is called before (to execute a proposal whose"]
@@ -325,11 +278,7 @@ pub struct Proposal<
     pub executor_result: i32,
     #[doc = " messages is a list of `sdk.Msg`s that will be executed if the proposal passes."]
     #[prost(message, repeated, tag = "12")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub messages: ::prost::alloc::vec::Vec<A>,
+    pub messages: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
     #[doc = " title is the title of the proposal"]
     #[doc = ""]
     #[doc = " Since: cosmos-sdk 0.47"]
@@ -341,17 +290,8 @@ pub struct Proposal<
     #[prost(string, tag = "14")]
     pub summary: ::prost::alloc::string::String,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Proposal<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Proposal<A>
 {
     const NAME: &'static str = "Proposal";
     const PACKAGE: &'static str = "cosmos.group.v1";
@@ -742,10 +682,6 @@ pub struct EventProposalPruned {
     pub status: i32,
     #[doc = " tally_result is the proposal tally result (when applicable)."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tally_result: ::core::option::Option<TallyResult>,
 }
 impl ::prost::Name for EventProposalPruned {
@@ -760,24 +696,8 @@ impl ::prost::Name for EventProposalPruned {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " group_seq is the group table orm.Sequence,"]
     #[doc = " it is used to get the next group ID."]
@@ -785,17 +705,9 @@ pub struct GenesisState<
     pub group_seq: u64,
     #[doc = " groups is the list of groups info."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub groups: ::prost::alloc::vec::Vec<GroupInfo>,
     #[doc = " group_members is the list of groups members."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub group_members: ::prost::alloc::vec::Vec<GroupMember>,
     #[doc = " group_policy_seq is the group policy table orm.Sequence,"]
     #[doc = " it is used to generate the next group policy account address."]
@@ -803,10 +715,6 @@ pub struct GenesisState<
     pub group_policy_seq: u64,
     #[doc = " group_policies is the list of group policies info."]
     #[prost(message, repeated, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub group_policies: ::prost::alloc::vec::Vec<GroupPolicyInfo<A>>,
     #[doc = " proposal_seq is the proposal table orm.Sequence,"]
     #[doc = " it is used to get the next proposal ID."]
@@ -814,38 +722,14 @@ pub struct GenesisState<
     pub proposal_seq: u64,
     #[doc = " proposals is the list of proposals."]
     #[prost(message, repeated, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub proposals: ::prost::alloc::vec::Vec<Proposal<BB>>,
     #[doc = " votes is the list of votes."]
     #[prost(message, repeated, tag = "8")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub votes: ::prost::alloc::vec::Vec<Vote>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for GenesisState<A, BB>
 {
     const NAME: &'static str = "GenesisState";
@@ -877,10 +761,6 @@ impl ::prost::Name for QueryGroupInfoRequest {
 pub struct QueryGroupInfoResponse {
     #[doc = " info is the GroupInfo of the group."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub info: ::core::option::Option<GroupInfo>,
 }
 impl ::prost::Name for QueryGroupInfoResponse {
@@ -911,35 +791,14 @@ impl ::prost::Name for QueryGroupPolicyInfoRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryGroupPolicyInfoResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " info is the GroupPolicyInfo of the group policy."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub info: ::core::option::Option<GroupPolicyInfo<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryGroupPolicyInfoResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryGroupPolicyInfoResponse<A>
 {
     const NAME: &'static str = "QueryGroupPolicyInfoResponse";
     const PACKAGE: &'static str = "cosmos.group.v1";
@@ -957,10 +816,6 @@ pub struct QueryGroupMembersRequest {
     pub group_id: u64,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryGroupMembersRequest {
@@ -977,17 +832,9 @@ impl ::prost::Name for QueryGroupMembersRequest {
 pub struct QueryGroupMembersResponse {
     #[doc = " members are the members of the group with given group_id."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub members: ::prost::alloc::vec::Vec<GroupMember>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryGroupMembersResponse {
@@ -1007,10 +854,6 @@ pub struct QueryGroupsByAdminRequest {
     pub admin: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryGroupsByAdminRequest {
@@ -1027,17 +870,9 @@ impl ::prost::Name for QueryGroupsByAdminRequest {
 pub struct QueryGroupsByAdminResponse {
     #[doc = " groups are the groups info with the provided admin."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub groups: ::prost::alloc::vec::Vec<GroupInfo>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryGroupsByAdminResponse {
@@ -1057,10 +892,6 @@ pub struct QueryGroupPoliciesByGroupRequest {
     pub group_id: u64,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryGroupPoliciesByGroupRequest {
@@ -1075,42 +906,17 @@ impl ::prost::Name for QueryGroupPoliciesByGroupRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryGroupPoliciesByGroupResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " group_policies are the group policies info associated with the provided group."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub group_policies: ::prost::alloc::vec::Vec<GroupPolicyInfo<A>>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryGroupPoliciesByGroupResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryGroupPoliciesByGroupResponse<A>
 {
     const NAME: &'static str = "QueryGroupPoliciesByGroupResponse";
     const PACKAGE: &'static str = "cosmos.group.v1";
@@ -1128,10 +934,6 @@ pub struct QueryGroupPoliciesByAdminRequest {
     pub admin: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryGroupPoliciesByAdminRequest {
@@ -1146,42 +948,17 @@ impl ::prost::Name for QueryGroupPoliciesByAdminRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryGroupPoliciesByAdminResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " group_policies are the group policies info with provided admin."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub group_policies: ::prost::alloc::vec::Vec<GroupPolicyInfo<A>>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryGroupPoliciesByAdminResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryGroupPoliciesByAdminResponse<A>
 {
     const NAME: &'static str = "QueryGroupPoliciesByAdminResponse";
     const PACKAGE: &'static str = "cosmos.group.v1";
@@ -1210,35 +987,14 @@ impl ::prost::Name for QueryProposalRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryProposalResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " proposal is the proposal info."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proposal: ::core::option::Option<Proposal<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryProposalResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryProposalResponse<A>
 {
     const NAME: &'static str = "QueryProposalResponse";
     const PACKAGE: &'static str = "cosmos.group.v1";
@@ -1256,10 +1012,6 @@ pub struct QueryProposalsByGroupPolicyRequest {
     pub address: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryProposalsByGroupPolicyRequest {
@@ -1274,42 +1026,17 @@ impl ::prost::Name for QueryProposalsByGroupPolicyRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryProposalsByGroupPolicyResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " proposals are the proposals with given group policy."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub proposals: ::prost::alloc::vec::Vec<Proposal<A>>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryProposalsByGroupPolicyResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryProposalsByGroupPolicyResponse<A>
 {
     const NAME: &'static str = "QueryProposalsByGroupPolicyResponse";
     const PACKAGE: &'static str = "cosmos.group.v1";
@@ -1343,10 +1070,6 @@ impl ::prost::Name for QueryVoteByProposalVoterRequest {
 pub struct QueryVoteByProposalVoterResponse {
     #[doc = " vote is the vote with given proposal_id and voter."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub vote: ::core::option::Option<Vote>,
 }
 impl ::prost::Name for QueryVoteByProposalVoterResponse {
@@ -1366,10 +1089,6 @@ pub struct QueryVotesByProposalRequest {
     pub proposal_id: u64,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryVotesByProposalRequest {
@@ -1386,17 +1105,9 @@ impl ::prost::Name for QueryVotesByProposalRequest {
 pub struct QueryVotesByProposalResponse {
     #[doc = " votes are the list of votes for given proposal_id."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub votes: ::prost::alloc::vec::Vec<Vote>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryVotesByProposalResponse {
@@ -1416,10 +1127,6 @@ pub struct QueryVotesByVoterRequest {
     pub voter: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryVotesByVoterRequest {
@@ -1436,17 +1143,9 @@ impl ::prost::Name for QueryVotesByVoterRequest {
 pub struct QueryVotesByVoterResponse {
     #[doc = " votes are the list of votes by given voter."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub votes: ::prost::alloc::vec::Vec<Vote>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryVotesByVoterResponse {
@@ -1466,10 +1165,6 @@ pub struct QueryGroupsByMemberRequest {
     pub address: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryGroupsByMemberRequest {
@@ -1486,17 +1181,9 @@ impl ::prost::Name for QueryGroupsByMemberRequest {
 pub struct QueryGroupsByMemberResponse {
     #[doc = " groups are the groups info with the provided group member."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub groups: ::prost::alloc::vec::Vec<GroupInfo>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryGroupsByMemberResponse {
@@ -1529,10 +1216,6 @@ impl ::prost::Name for QueryTallyResultRequest {
 pub struct QueryTallyResultResponse {
     #[doc = " tally defines the requested tally."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tally: ::core::option::Option<TallyResult>,
 }
 impl ::prost::Name for QueryTallyResultResponse {
@@ -1551,10 +1234,6 @@ impl ::prost::Name for QueryTallyResultResponse {
 pub struct QueryGroupsRequest {
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryGroupsRequest {
@@ -1573,17 +1252,9 @@ impl ::prost::Name for QueryGroupsRequest {
 pub struct QueryGroupsResponse {
     #[doc = " `groups` is all the groups present in state."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub groups: ::prost::alloc::vec::Vec<GroupInfo>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryGroupsResponse {
@@ -1603,10 +1274,6 @@ pub struct MsgCreateGroup {
     pub admin: ::prost::alloc::string::String,
     #[doc = " members defines the group members."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub members: ::prost::alloc::vec::Vec<MemberRequest>,
     #[doc = " metadata is any arbitrary metadata to attached to the group."]
     #[prost(string, tag = "3")]
@@ -1649,10 +1316,6 @@ pub struct MsgUpdateGroupMembers {
     #[doc = " member_updates is the list of members to update,"]
     #[doc = " set weight to 0 to remove a member."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub member_updates: ::prost::alloc::vec::Vec<MemberRequest>,
 }
 impl ::prost::Name for MsgUpdateGroupMembers {
@@ -1747,15 +1410,7 @@ impl ::prost::Name for MsgUpdateGroupMetadataResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgCreateGroupPolicy<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " admin is the account address of the group admin."]
     #[prost(string, tag = "1")]
@@ -1768,23 +1423,10 @@ pub struct MsgCreateGroupPolicy<
     pub metadata: ::prost::alloc::string::String,
     #[doc = " decision_policy specifies the group policy's decision policy."]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub decision_policy: ::core::option::Option<A>,
+    pub decision_policy: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgCreateGroupPolicy<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgCreateGroupPolicy<A>
 {
     const NAME: &'static str = "MsgCreateGroupPolicy";
     const PACKAGE: &'static str = "cosmos.group.v1";
@@ -1847,25 +1489,13 @@ impl ::prost::Name for MsgUpdateGroupPolicyAdminResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgCreateGroupWithPolicy<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " admin is the account address of the group and group policy admin."]
     #[prost(string, tag = "1")]
     pub admin: ::prost::alloc::string::String,
     #[doc = " members defines the group members."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub members: ::prost::alloc::vec::Vec<MemberRequest>,
     #[doc = " group_metadata is any arbitrary metadata attached to the group."]
     #[prost(string, tag = "3")]
@@ -1879,23 +1509,10 @@ pub struct MsgCreateGroupWithPolicy<
     pub group_policy_as_admin: bool,
     #[doc = " decision_policy specifies the group policy's decision policy."]
     #[prost(message, optional, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub decision_policy: ::core::option::Option<A>,
+    pub decision_policy: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgCreateGroupWithPolicy<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgCreateGroupWithPolicy<A>
 {
     const NAME: &'static str = "MsgCreateGroupWithPolicy";
     const PACKAGE: &'static str = "cosmos.group.v1";
@@ -1927,15 +1544,7 @@ impl ::prost::Name for MsgCreateGroupWithPolicyResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgUpdateGroupPolicyDecisionPolicy<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " admin is the account address of the group admin."]
     #[prost(string, tag = "1")]
@@ -1945,23 +1554,10 @@ pub struct MsgUpdateGroupPolicyDecisionPolicy<
     pub group_policy_address: ::prost::alloc::string::String,
     #[doc = " decision_policy is the updated group policy's decision policy."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub decision_policy: ::core::option::Option<A>,
+    pub decision_policy: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgUpdateGroupPolicyDecisionPolicy<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgUpdateGroupPolicyDecisionPolicy<A>
 {
     const NAME: &'static str = "MsgUpdateGroupPolicyDecisionPolicy";
     const PACKAGE: &'static str = "cosmos.group.v1";
@@ -2020,15 +1616,7 @@ impl ::prost::Name for MsgUpdateGroupPolicyMetadataResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgSubmitProposal<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " group_policy_address is the account address of group policy."]
     #[prost(string, tag = "1")]
@@ -2042,11 +1630,7 @@ pub struct MsgSubmitProposal<
     pub metadata: ::prost::alloc::string::String,
     #[doc = " messages is a list of `sdk.Msg`s that will be executed if the proposal passes."]
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub messages: ::prost::alloc::vec::Vec<A>,
+    pub messages: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
     #[doc = " exec defines the mode of execution of the proposal,"]
     #[doc = " whether it should be executed immediately on creation or not."]
     #[doc = " If so, proposers signatures are considered as Yes votes."]
@@ -2063,17 +1647,8 @@ pub struct MsgSubmitProposal<
     #[prost(string, tag = "7")]
     pub summary: ::prost::alloc::string::String,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgSubmitProposal<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgSubmitProposal<A>
 {
     const NAME: &'static str = "MsgSubmitProposal";
     const PACKAGE: &'static str = "cosmos.group.v1";
diff --git a/packages/proto/src/gen/cosmos.nft.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.nft.v1beta1.abstract.rs
index 20a6522..9d8631c 100644
--- a/packages/proto/src/gen/cosmos.nft.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.nft.v1beta1.abstract.rs
@@ -71,17 +71,7 @@ impl ::prost::Name for EventBurn {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Class<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Class<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " id defines the unique identifier of the NFT classification, similar to the contract address of ERC721"]
     #[prost(string, tag = "1")]
     pub id: ::prost::alloc::string::String,
@@ -102,23 +92,10 @@ pub struct Class<
     pub uri_hash: ::prost::alloc::string::String,
     #[doc = " data is the app specific metadata of the NFT class. Optional"]
     #[prost(message, optional, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub data: ::core::option::Option<A>,
+    pub data: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Class<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Class<A>
 {
     const NAME: &'static str = "Class";
     const PACKAGE: &'static str = "cosmos.nft.v1beta1";
@@ -130,17 +107,7 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Nft<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Nft<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " class_id associated with the NFT, similar to the contract address of ERC721"]
     #[prost(string, tag = "1")]
     pub class_id: ::prost::alloc::string::String,
@@ -155,23 +122,10 @@ pub struct Nft<
     pub uri_hash: ::prost::alloc::string::String,
     #[doc = " data is an app specific data of the NFT. Optional"]
     #[prost(message, optional, tag = "10")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub data: ::core::option::Option<A>,
+    pub data: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Nft<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Nft<A>
 {
     const NAME: &'static str = "NFT";
     const PACKAGE: &'static str = "cosmos.nft.v1beta1";
@@ -184,59 +138,19 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " class defines the class of the nft type."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub classes: ::prost::alloc::vec::Vec<Class<A>>,
     #[doc = " entry defines all nft owned by a person."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub entries: ::prost::alloc::vec::Vec<Entry<BB>>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for GenesisState<A, BB>
 {
     const NAME: &'static str = "GenesisState";
@@ -249,39 +163,16 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Entry<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Entry<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " owner is the owner address of the following nft"]
     #[prost(string, tag = "1")]
     pub owner: ::prost::alloc::string::String,
     #[doc = " nfts is a group of nfts of the same owner"]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub nfts: ::prost::alloc::vec::Vec<Nft<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Entry<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Entry<A>
 {
     const NAME: &'static str = "Entry";
     const PACKAGE: &'static str = "cosmos.nft.v1beta1";
@@ -404,10 +295,6 @@ pub struct QueryNfTsRequest {
     pub owner: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryNfTsRequest {
@@ -422,42 +309,17 @@ impl ::prost::Name for QueryNfTsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryNfTsResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " NFT defines the NFT"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub nfts: ::prost::alloc::vec::Vec<Nft<A>>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryNfTsResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryNfTsResponse<A>
 {
     const NAME: &'static str = "QueryNFTsResponse";
     const PACKAGE: &'static str = "cosmos.nft.v1beta1";
@@ -489,35 +351,14 @@ impl ::prost::Name for QueryNftRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryNftResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " owner is the owner address of the nft"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub nft: ::core::option::Option<Nft<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryNftResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryNftResponse<A>
 {
     const NAME: &'static str = "QueryNFTResponse";
     const PACKAGE: &'static str = "cosmos.nft.v1beta1";
@@ -546,35 +387,14 @@ impl ::prost::Name for QueryClassRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryClassResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " class defines the class of the nft type."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub class: ::core::option::Option<Class<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryClassResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryClassResponse<A>
 {
     const NAME: &'static str = "QueryClassResponse";
     const PACKAGE: &'static str = "cosmos.nft.v1beta1";
@@ -589,10 +409,6 @@ impl<
 pub struct QueryClassesRequest {
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryClassesRequest {
@@ -607,42 +423,17 @@ impl ::prost::Name for QueryClassesRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryClassesResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " class defines the class of the nft type."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub classes: ::prost::alloc::vec::Vec<Class<A>>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryClassesResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryClassesResponse<A>
 {
     const NAME: &'static str = "QueryClassesResponse";
     const PACKAGE: &'static str = "cosmos.nft.v1beta1";
diff --git a/packages/proto/src/gen/cosmos.orm.query.v1alpha1.abstract.rs b/packages/proto/src/gen/cosmos.orm.query.v1alpha1.abstract.rs
index 7c78538..da4bdd6 100644
--- a/packages/proto/src/gen/cosmos.orm.query.v1alpha1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.orm.query.v1alpha1.abstract.rs
@@ -15,10 +15,6 @@ pub struct GetRequest {
     #[doc = " There must be as many values provided as there are fields in the index and"]
     #[doc = " these values must correspond to the index field types."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub values: ::prost::alloc::vec::Vec<IndexValue>,
 }
 impl ::prost::Name for GetRequest {
@@ -32,37 +28,15 @@ impl ::prost::Name for GetRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GetResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct GetResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[doc = " result is the result of the get query. If no value is found, the gRPC"]
     #[doc = " status code NOT_FOUND will be returned."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub result: ::core::option::Option<A>,
+    pub result: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GetResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GetResponse<A>
 {
     const NAME: &'static str = "GetResponse";
     const PACKAGE: &'static str = "cosmos.orm.query.v1alpha1";
@@ -84,10 +58,6 @@ pub struct ListRequest {
     pub index: ::prost::alloc::string::String,
     #[doc = " pagination is the pagination request."]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::super::base::query::v1beta1::PageRequest>,
     #[doc = " query is the query expression corresponding to the provided index. If"]
     #[doc = " neither prefix nor range is specified, the query will list all the fields"]
@@ -164,43 +134,17 @@ impl ::prost::Name for ListRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ListResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct ListResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[doc = " results are the results of the query."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub results: ::prost::alloc::vec::Vec<A>,
+    pub results: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
     #[doc = " pagination is the pagination response."]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ListResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ListResponse<A>
 {
     const NAME: &'static str = "ListResponse";
     const PACKAGE: &'static str = "cosmos.orm.query.v1alpha1";
diff --git a/packages/proto/src/gen/cosmos.staking.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.staking.v1beta1.abstract.rs
index 36afd7e..afa045d 100644
--- a/packages/proto/src/gen/cosmos.staking.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.staking.v1beta1.abstract.rs
@@ -8,10 +8,6 @@ pub struct StakeAuthorization {
     #[doc = " max_tokens specifies the maximum amount of tokens can be delegate to a validator. If it is"]
     #[doc = " empty, there is no spend limit and any amount of coins can be delegated."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub max_tokens: ::core::option::Option<super::super::base::v1beta1::Coin>,
     #[doc = " authorization_type defines one of AuthorizationType."]
     #[prost(enumeration = "AuthorizationType", tag = "4")]
@@ -117,40 +113,15 @@ impl AuthorizationType {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct HistoricalInfo<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub header: ::core::option::Option<::tendermint_proto::v0_37::types::Header>,
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub valset: ::prost::alloc::vec::Vec<Validator<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for HistoricalInfo<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for HistoricalInfo<A>
 {
     const NAME: &'static str = "HistoricalInfo";
     const PACKAGE: &'static str = "cosmos.staking.v1beta1";
@@ -188,10 +159,6 @@ impl ::prost::Name for CommissionRates {
 pub struct Commission {
     #[doc = " commission_rates defines the initial commission rates to be used for creating a validator."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub commission_rates: ::core::option::Option<CommissionRates>,
     #[doc = " update_time is the last time the commission rate was changed."]
     #[prost(message, optional, tag = "2")]
@@ -243,27 +210,13 @@ impl ::prost::Name for Description {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Validator<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Validator<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " operator_address defines the address of the validator's operator; bech encoded in JSON."]
     #[prost(string, tag = "1")]
     pub operator_address: ::prost::alloc::string::String,
     #[doc = " consensus_pubkey is the consensus public key of the validator, as a Protobuf Any."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub consensus_pubkey: ::core::option::Option<A>,
+    pub consensus_pubkey: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " jailed defined whether the validator has been jailed from bonded status or not."]
     #[prost(bool, tag = "3")]
     pub jailed: bool,
@@ -278,10 +231,6 @@ pub struct Validator<
     pub delegator_shares: ::prost::alloc::string::String,
     #[doc = " description defines the description terms for the validator."]
     #[prost(message, optional, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub description: ::core::option::Option<Description>,
     #[doc = " unbonding_height defines, if unbonding, the height at which this validator has begun unbonding."]
     #[prost(int64, tag = "8")]
@@ -291,10 +240,6 @@ pub struct Validator<
     pub unbonding_time: ::core::option::Option<::pbjson_types::Timestamp>,
     #[doc = " commission defines the commission parameters."]
     #[prost(message, optional, tag = "10")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub commission: ::core::option::Option<Commission>,
     #[doc = " min_self_delegation is the validator's self declared minimum self delegation."]
     #[doc = ""]
@@ -308,17 +253,8 @@ pub struct Validator<
     #[prost(uint64, repeated, tag = "13")]
     pub unbonding_ids: ::prost::alloc::vec::Vec<u64>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Validator<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Validator<A>
 {
     const NAME: &'static str = "Validator";
     const PACKAGE: &'static str = "cosmos.staking.v1beta1";
@@ -366,10 +302,6 @@ impl ::prost::Name for DvPair {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct DvPairs {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub pairs: ::prost::alloc::vec::Vec<DvPair>,
 }
 impl ::prost::Name for DvPairs {
@@ -407,10 +339,6 @@ impl ::prost::Name for DvvTriplet {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct DvvTriplets {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub triplets: ::prost::alloc::vec::Vec<DvvTriplet>,
 }
 impl ::prost::Name for DvvTriplets {
@@ -460,10 +388,6 @@ pub struct UnbondingDelegation {
     #[doc = ""]
     #[doc = " unbonding delegation entries"]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub entries: ::prost::alloc::vec::Vec<UnbondingDelegationEntry>,
 }
 impl ::prost::Name for UnbondingDelegation {
@@ -554,10 +478,6 @@ pub struct Redelegation {
     #[doc = ""]
     #[doc = " redelegation entries"]
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub entries: ::prost::alloc::vec::Vec<RedelegationEntry>,
 }
 impl ::prost::Name for Redelegation {
@@ -605,16 +525,8 @@ impl ::prost::Name for Params {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct DelegationResponse {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub delegation: ::core::option::Option<Delegation>,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub balance: ::core::option::Option<super::super::base::v1beta1::Coin>,
 }
 impl ::prost::Name for DelegationResponse {
@@ -632,10 +544,6 @@ impl ::prost::Name for DelegationResponse {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct RedelegationEntryResponse {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub redelegation_entry: ::core::option::Option<RedelegationEntry>,
     #[prost(string, tag = "4")]
     pub balance: ::prost::alloc::string::String,
@@ -655,16 +563,8 @@ impl ::prost::Name for RedelegationEntryResponse {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct RedelegationResponse {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub redelegation: ::core::option::Option<Redelegation>,
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub entries: ::prost::alloc::vec::Vec<RedelegationEntryResponse>,
 }
 impl ::prost::Name for RedelegationResponse {
@@ -806,23 +706,10 @@ impl Infraction {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[doc = " params defines all the parameters of related to deposit."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
     #[doc = " last_total_power tracks the total amounts of bonded tokens recorded during"]
     #[doc = " the previous end block."]
@@ -831,53 +718,24 @@ pub struct GenesisState<
     #[doc = " last_validator_powers is a special index that provides a historical list"]
     #[doc = " of the last-block's bonded validators."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub last_validator_powers: ::prost::alloc::vec::Vec<LastValidatorPower>,
     #[doc = " delegations defines the validator set at genesis."]
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub validators: ::prost::alloc::vec::Vec<Validator<A>>,
     #[doc = " delegations defines the delegations active at genesis."]
     #[prost(message, repeated, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub delegations: ::prost::alloc::vec::Vec<Delegation>,
     #[doc = " unbonding_delegations defines the unbonding delegations active at genesis."]
     #[prost(message, repeated, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub unbonding_delegations: ::prost::alloc::vec::Vec<UnbondingDelegation>,
     #[doc = " redelegations defines the redelegations active at genesis."]
     #[prost(message, repeated, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub redelegations: ::prost::alloc::vec::Vec<Redelegation>,
     #[prost(bool, tag = "8")]
     pub exported: bool,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GenesisState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
     const PACKAGE: &'static str = "cosmos.staking.v1beta1";
@@ -914,10 +772,6 @@ pub struct QueryValidatorsRequest {
     pub status: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryValidatorsRequest {
@@ -932,42 +786,17 @@ impl ::prost::Name for QueryValidatorsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryValidatorsResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " validators contains all the queried validators."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub validators: ::prost::alloc::vec::Vec<Validator<A>>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryValidatorsResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryValidatorsResponse<A>
 {
     const NAME: &'static str = "QueryValidatorsResponse";
     const PACKAGE: &'static str = "cosmos.staking.v1beta1";
@@ -996,35 +825,14 @@ impl ::prost::Name for QueryValidatorRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryValidatorResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " validator defines the validator info."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub validator: ::core::option::Option<Validator<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryValidatorResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryValidatorResponse<A>
 {
     const NAME: &'static str = "QueryValidatorResponse";
     const PACKAGE: &'static str = "cosmos.staking.v1beta1";
@@ -1043,10 +851,6 @@ pub struct QueryValidatorDelegationsRequest {
     pub validator_addr: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryValidatorDelegationsRequest {
@@ -1063,17 +867,9 @@ impl ::prost::Name for QueryValidatorDelegationsRequest {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryValidatorDelegationsResponse {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub delegation_responses: ::prost::alloc::vec::Vec<DelegationResponse>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryValidatorDelegationsResponse {
@@ -1094,10 +890,6 @@ pub struct QueryValidatorUnbondingDelegationsRequest {
     pub validator_addr: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryValidatorUnbondingDelegationsRequest {
@@ -1114,17 +906,9 @@ impl ::prost::Name for QueryValidatorUnbondingDelegationsRequest {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryValidatorUnbondingDelegationsResponse {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub unbonding_responses: ::prost::alloc::vec::Vec<UnbondingDelegation>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryValidatorUnbondingDelegationsResponse {
@@ -1160,10 +944,6 @@ impl ::prost::Name for QueryDelegationRequest {
 pub struct QueryDelegationResponse {
     #[doc = " delegation_responses defines the delegation info of a delegation."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub delegation_response: ::core::option::Option<DelegationResponse>,
 }
 impl ::prost::Name for QueryDelegationResponse {
@@ -1201,10 +981,6 @@ impl ::prost::Name for QueryUnbondingDelegationRequest {
 pub struct QueryUnbondingDelegationResponse {
     #[doc = " unbond defines the unbonding information of a delegation."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub unbond: ::core::option::Option<UnbondingDelegation>,
 }
 impl ::prost::Name for QueryUnbondingDelegationResponse {
@@ -1225,10 +1001,6 @@ pub struct QueryDelegatorDelegationsRequest {
     pub delegator_addr: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryDelegatorDelegationsRequest {
@@ -1246,17 +1018,9 @@ impl ::prost::Name for QueryDelegatorDelegationsRequest {
 pub struct QueryDelegatorDelegationsResponse {
     #[doc = " delegation_responses defines all the delegations' info of a delegator."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub delegation_responses: ::prost::alloc::vec::Vec<DelegationResponse>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryDelegatorDelegationsResponse {
@@ -1277,10 +1041,6 @@ pub struct QueryDelegatorUnbondingDelegationsRequest {
     pub delegator_addr: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryDelegatorUnbondingDelegationsRequest {
@@ -1297,17 +1057,9 @@ impl ::prost::Name for QueryDelegatorUnbondingDelegationsRequest {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryDelegatorUnbondingDelegationsResponse {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub unbonding_responses: ::prost::alloc::vec::Vec<UnbondingDelegation>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryDelegatorUnbondingDelegationsResponse {
@@ -1334,10 +1086,6 @@ pub struct QueryRedelegationsRequest {
     pub dst_validator_addr: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryRedelegationsRequest {
@@ -1354,17 +1102,9 @@ impl ::prost::Name for QueryRedelegationsRequest {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryRedelegationsResponse {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub redelegation_responses: ::prost::alloc::vec::Vec<RedelegationResponse>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl ::prost::Name for QueryRedelegationsResponse {
@@ -1385,10 +1125,6 @@ pub struct QueryDelegatorValidatorsRequest {
     pub delegator_addr: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for QueryDelegatorValidatorsRequest {
@@ -1404,42 +1140,17 @@ impl ::prost::Name for QueryDelegatorValidatorsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryDelegatorValidatorsResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " validators defines the validators' info of a delegator."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub validators: ::prost::alloc::vec::Vec<Validator<A>>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryDelegatorValidatorsResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryDelegatorValidatorsResponse<A>
 {
     const NAME: &'static str = "QueryDelegatorValidatorsResponse";
     const PACKAGE: &'static str = "cosmos.staking.v1beta1";
@@ -1473,35 +1184,14 @@ impl ::prost::Name for QueryDelegatorValidatorRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryDelegatorValidatorResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " validator defines the validator info."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub validator: ::core::option::Option<Validator<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryDelegatorValidatorResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryDelegatorValidatorResponse<A>
 {
     const NAME: &'static str = "QueryDelegatorValidatorResponse";
     const PACKAGE: &'static str = "cosmos.staking.v1beta1";
@@ -1532,35 +1222,14 @@ impl ::prost::Name for QueryHistoricalInfoRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryHistoricalInfoResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " hist defines the historical info at the given height."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub hist: ::core::option::Option<HistoricalInfo<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryHistoricalInfoResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryHistoricalInfoResponse<A>
 {
     const NAME: &'static str = "QueryHistoricalInfoResponse";
     const PACKAGE: &'static str = "cosmos.staking.v1beta1";
@@ -1587,10 +1256,6 @@ impl ::prost::Name for QueryPoolRequest {
 pub struct QueryPoolResponse {
     #[doc = " pool defines the pool info."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pool: ::core::option::Option<Pool>,
 }
 impl ::prost::Name for QueryPoolResponse {
@@ -1619,10 +1284,6 @@ impl ::prost::Name for QueryParamsRequest {
 pub struct QueryParamsResponse {
     #[doc = " params holds all the parameters of this module."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for QueryParamsResponse {
@@ -1637,27 +1298,11 @@ impl ::prost::Name for QueryParamsResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgCreateValidator<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub description: ::core::option::Option<Description>,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub commission: ::core::option::Option<CommissionRates>,
     #[prost(string, tag = "3")]
     pub min_self_delegation: ::prost::alloc::string::String,
@@ -1666,29 +1311,12 @@ pub struct MsgCreateValidator<
     #[prost(string, tag = "5")]
     pub validator_address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub pubkey: ::core::option::Option<A>,
+    pub pubkey: ::core::option::Option<crate::any::Any<A>>,
     #[prost(message, optional, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub value: ::core::option::Option<super::super::base::v1beta1::Coin>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgCreateValidator<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgCreateValidator<A>
 {
     const NAME: &'static str = "MsgCreateValidator";
     const PACKAGE: &'static str = "cosmos.staking.v1beta1";
@@ -1714,10 +1342,6 @@ impl ::prost::Name for MsgCreateValidatorResponse {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgEditValidator {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub description: ::core::option::Option<Description>,
     #[prost(string, tag = "2")]
     pub validator_address: ::prost::alloc::string::String,
@@ -1760,10 +1384,6 @@ pub struct MsgDelegate {
     #[prost(string, tag = "2")]
     pub validator_address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub amount: ::core::option::Option<super::super::base::v1beta1::Coin>,
 }
 impl ::prost::Name for MsgDelegate {
@@ -1798,10 +1418,6 @@ pub struct MsgBeginRedelegate {
     #[prost(string, tag = "3")]
     pub validator_dst_address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub amount: ::core::option::Option<super::super::base::v1beta1::Coin>,
 }
 impl ::prost::Name for MsgBeginRedelegate {
@@ -1837,10 +1453,6 @@ pub struct MsgUndelegate {
     #[prost(string, tag = "2")]
     pub validator_address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub amount: ::core::option::Option<super::super::base::v1beta1::Coin>,
 }
 impl ::prost::Name for MsgUndelegate {
@@ -1878,10 +1490,6 @@ pub struct MsgCancelUnbondingDelegation {
     pub validator_address: ::prost::alloc::string::String,
     #[doc = " amount is always less than or equal to unbonding delegation entry balance"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub amount: ::core::option::Option<super::super::base::v1beta1::Coin>,
     #[doc = " creation_height is the height which the unbonding took place."]
     #[prost(int64, tag = "4")]
@@ -1922,10 +1530,6 @@ pub struct MsgUpdateParams {
     #[doc = ""]
     #[doc = " NOTE: All parameters must be supplied."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for MsgUpdateParams {
diff --git a/packages/proto/src/gen/cosmos.tx.signing.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.tx.signing.v1beta1.abstract.rs
index fca49c5..16ab334 100644
--- a/packages/proto/src/gen/cosmos.tx.signing.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.tx.signing.v1beta1.abstract.rs
@@ -3,35 +3,14 @@
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct SignatureDescriptors<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " signatures are the signature descriptors"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub signatures: ::prost::alloc::vec::Vec<SignatureDescriptor<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for SignatureDescriptors<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for SignatureDescriptors<A>
 {
     const NAME: &'static str = "SignatureDescriptors";
     const PACKAGE: &'static str = "cosmos.tx.signing.v1beta1";
@@ -47,23 +26,11 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct SignatureDescriptor<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " public_key is the public key of the signer"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub public_key: ::core::option::Option<A>,
+    pub public_key: ::core::option::Option<crate::any::Any<A>>,
     #[prost(message, optional, tag = "2")]
     pub data: ::core::option::Option<signature_descriptor::Data>,
     #[doc = " sequence is the sequence of the account, which describes the"]
@@ -155,17 +122,8 @@ pub mod signature_descriptor {
         }
     }
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for SignatureDescriptor<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for SignatureDescriptor<A>
 {
     const NAME: &'static str = "SignatureDescriptor";
     const PACKAGE: &'static str = "cosmos.tx.signing.v1beta1";
diff --git a/packages/proto/src/gen/cosmos.tx.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.tx.v1beta1.abstract.rs
index 69500fb..3bfb9af 100644
--- a/packages/proto/src/gen/cosmos.tx.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.tx.v1beta1.abstract.rs
@@ -3,57 +3,17 @@
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct Tx<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    C: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    D: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " body is the processable content of the transaction"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub body: ::core::option::Option<TxBody<A, BB, C>>,
     #[doc = " auth_info is the authorization related content of the transaction,"]
     #[doc = " specifically signers, signer modes and fee"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub auth_info: ::core::option::Option<AuthInfo<D>>,
     #[doc = " signatures is a list of signatures that matches the length and order of"]
     #[doc = " AuthInfo's signer_infos to allow connecting signature meta information like"]
@@ -62,42 +22,10 @@ pub struct Tx<
     pub signatures: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        C: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        D: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for Tx<A, BB, C, D>
 {
     const NAME: &'static str = "Tx";
@@ -173,15 +101,7 @@ impl ::prost::Name for SignDoc {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct SignDocDirectAux<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " body_bytes is protobuf serialization of a TxBody that matches the"]
     #[doc = " representation in TxRaw."]
@@ -189,11 +109,7 @@ pub struct SignDocDirectAux<
     pub body_bytes: ::prost::alloc::vec::Vec<u8>,
     #[doc = " public_key is the public key of the signing account."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub public_key: ::core::option::Option<A>,
+    pub public_key: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " chain_id is the identifier of the chain this transaction targets."]
     #[doc = " It prevents signed transactions from being used on another chain by an"]
     #[doc = " attacker."]
@@ -212,23 +128,10 @@ pub struct SignDocDirectAux<
     #[doc = " This field is ignored if the chain didn't enable tips, i.e. didn't add the"]
     #[doc = " `TipDecorator` in its posthandler."]
     #[prost(message, optional, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tip: ::core::option::Option<Tip>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for SignDocDirectAux<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for SignDocDirectAux<A>
 {
     const NAME: &'static str = "SignDocDirectAux";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
@@ -241,33 +144,9 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct TxBody<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    C: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " messages is a list of messages to be executed. The required signers of"]
     #[doc = " those messages define the number and order of elements in AuthInfo's"]
@@ -277,11 +156,7 @@ pub struct TxBody<
     #[doc = " is referred to as the primary signer and pays the fee for the whole"]
     #[doc = " transaction."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub messages: ::prost::alloc::vec::Vec<A>,
+    pub messages: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
     #[doc = " memo is any arbitrary note/comment to be added to the transaction."]
     #[doc = " WARNING: in clients, any publicly exposed text should not be called memo,"]
     #[doc = " but should be called `note` instead (see <https://github.com/cosmos/cosmos-sdk/issues/9122>)."]
@@ -295,49 +170,17 @@ pub struct TxBody<
     #[doc = " when the default options are not sufficient. If any of these are present"]
     #[doc = " and can't be handled, the transaction will be rejected"]
     #[prost(message, repeated, tag = "1023")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub extension_options: ::prost::alloc::vec::Vec<BB>,
+    pub extension_options: ::prost::alloc::vec::Vec<crate::any::Any<BB>>,
     #[doc = " extension_options are arbitrary options that can be added by chains"]
     #[doc = " when the default options are not sufficient. If any of these are present"]
     #[doc = " and can't be handled, they will be ignored"]
     #[prost(message, repeated, tag = "2047")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub non_critical_extension_options: ::prost::alloc::vec::Vec<C>,
+    pub non_critical_extension_options: ::prost::alloc::vec::Vec<crate::any::Any<C>>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        C: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for TxBody<A, BB, C>
 {
     const NAME: &'static str = "TxBody";
@@ -351,36 +194,18 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct AuthInfo<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct AuthInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " signer_infos defines the signing modes for the required signers. The number"]
     #[doc = " and order of elements must match the required signers from TxBody's"]
     #[doc = " messages. The first element is the primary signer and the one which pays"]
     #[doc = " the fee."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub signer_infos: ::prost::alloc::vec::Vec<SignerInfo<A>>,
     #[doc = " Fee is the fee and gas limit for the transaction. The first signer is the"]
     #[doc = " primary signer and the one which pays the fee. The fee can be calculated"]
     #[doc = " based on the cost of evaluating the body and doing signature verification"]
     #[doc = " of the signers. This can be estimated via simulation."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub fee: ::core::option::Option<Fee>,
     #[doc = " Tip is the optional tip used for transactions fees paid in another denom."]
     #[doc = ""]
@@ -389,23 +214,10 @@ pub struct AuthInfo<
     #[doc = ""]
     #[doc = " Since: cosmos-sdk 0.46"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tip: ::core::option::Option<Tip>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for AuthInfo<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for AuthInfo<A>
 {
     const NAME: &'static str = "AuthInfo";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
@@ -418,33 +230,15 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct SignerInfo<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct SignerInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " public_key is the public key of the signer. It is optional for accounts"]
     #[doc = " that already exist in state. If unset, the verifier can use the required \\"]
     #[doc = " signer address for this position and lookup the public key."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub public_key: ::core::option::Option<A>,
+    pub public_key: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " mode_info describes the signing mode of the signer and is a nested"]
     #[doc = " structure to support nested multisig pubkey's"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub mode_info: ::core::option::Option<ModeInfo>,
     #[doc = " sequence is the sequence of the account, which describes the"]
     #[doc = " number of committed transactions signed by a given address. It is used to"]
@@ -452,17 +246,8 @@ pub struct SignerInfo<
     #[prost(uint64, tag = "3")]
     pub sequence: u64,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for SignerInfo<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for SignerInfo<A>
 {
     const NAME: &'static str = "SignerInfo";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
@@ -551,10 +336,6 @@ impl ::prost::Name for ModeInfo {
 pub struct Fee {
     #[doc = " amount is the amount of coins to be paid as a fee"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub amount: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " gas_limit is the maximum gas that can be used in transaction processing"]
     #[doc = " before an out of gas error occurs"]
@@ -587,10 +368,6 @@ impl ::prost::Name for Fee {
 pub struct Tip {
     #[doc = " amount is the amount of the tip"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub amount: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " tipper is the address of the account paying for the tip"]
     #[prost(string, tag = "2")]
@@ -613,15 +390,7 @@ impl ::prost::Name for Tip {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct AuxSignerData<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " address is the bech32-encoded address of the auxiliary signer. If using"]
     #[doc = " AuxSignerData across different chains, the bech32 prefix of the target"]
@@ -632,10 +401,6 @@ pub struct AuxSignerData<
     #[doc = " signs. Note: we use the same sign doc even if we're signing with"]
     #[doc = " LEGACY_AMINO_JSON."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub sign_doc: ::core::option::Option<SignDocDirectAux<A>>,
     #[doc = " mode is the signing mode of the single signer."]
     #[prost(enumeration = "super::signing::v1beta1::SignMode", tag = "3")]
@@ -644,17 +409,8 @@ pub struct AuxSignerData<
     #[prost(bytes = "vec", tag = "4")]
     pub sig: ::prost::alloc::vec::Vec<u8>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for AuxSignerData<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for AuxSignerData<A>
 {
     const NAME: &'static str = "AuxSignerData";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
@@ -675,10 +431,6 @@ pub struct GetTxsEventRequest {
     #[doc = " Deprecated post v0.46.x: use page and limit instead."]
     #[deprecated]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
     #[prost(enumeration = "OrderBy", tag = "3")]
     pub order_by: i32,
@@ -703,125 +455,33 @@ impl ::prost::Name for GetTxsEventRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GetTxsEventResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    C: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    D: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    E: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    E: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " txs is the list of queried transactions."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub txs: ::prost::alloc::vec::Vec<Tx<A, BB, C, D>>,
     #[doc = " tx_responses is the list of queried TxResponses."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub tx_responses: ::prost::alloc::vec::Vec<super::super::base::abci::v1beta1::TxResponse<E>>,
     #[doc = " pagination defines a pagination for the response."]
     #[doc = " Deprecated post v0.46.x: use total instead."]
     #[deprecated]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
     #[doc = " total is total number of results available"]
     #[prost(uint64, tag = "4")]
     pub total: u64,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        C: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        D: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        E: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        E: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for GetTxsEventResponse<A, BB, C, D, E>
 {
     const NAME: &'static str = "GetTxsEventResponse";
@@ -855,35 +515,14 @@ impl ::prost::Name for BroadcastTxRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct BroadcastTxResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " tx_response is the queried TxResponses."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tx_response: ::core::option::Option<super::super::base::abci::v1beta1::TxResponse<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for BroadcastTxResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for BroadcastTxResponse<A>
 {
     const NAME: &'static str = "BroadcastTxResponse";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
@@ -897,51 +536,15 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct SimulateRequest<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    C: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    D: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " tx is the transaction to simulate."]
     #[doc = " Deprecated. Send raw tx bytes instead."]
     #[deprecated]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tx: ::core::option::Option<Tx<A, BB, C, D>>,
     #[doc = " tx_bytes is the raw transaction."]
     #[doc = ""]
@@ -950,42 +553,10 @@ pub struct SimulateRequest<
     pub tx_bytes: ::prost::alloc::vec::Vec<u8>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        C: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        D: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for SimulateRequest<A, BB, C, D>
 {
     const NAME: &'static str = "SimulateRequest";
@@ -1000,42 +571,17 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct SimulateResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " gas_info is the information about gas used in the simulation."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub gas_info: ::core::option::Option<super::super::base::abci::v1beta1::GasInfo>,
     #[doc = " result is the result of the simulation."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub result: ::core::option::Option<super::super::base::abci::v1beta1::Result<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for SimulateResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for SimulateResponse<A>
 {
     const NAME: &'static str = "SimulateResponse";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
@@ -1065,113 +611,25 @@ impl ::prost::Name for GetTxRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GetTxResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    C: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    D: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    E: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    E: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " tx is the queried transaction."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tx: ::core::option::Option<Tx<A, BB, C, D>>,
     #[doc = " tx_response is the queried TxResponses."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tx_response: ::core::option::Option<super::super::base::abci::v1beta1::TxResponse<E>>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        C: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        D: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        E: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        E: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for GetTxResponse<A, BB, C, D, E>
 {
     const NAME: &'static str = "GetTxResponse";
@@ -1193,10 +651,6 @@ pub struct GetBlockWithTxsRequest {
     pub height: i64,
     #[doc = " pagination defines a pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageRequest>,
 }
 impl ::prost::Name for GetBlockWithTxsRequest {
@@ -1213,103 +667,27 @@ impl ::prost::Name for GetBlockWithTxsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GetBlockWithTxsResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    C: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    D: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " txs are the transactions in the block."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub txs: ::prost::alloc::vec::Vec<Tx<A, BB, C, D>>,
     #[prost(message, optional, tag = "2")]
     pub block_id: ::core::option::Option<::tendermint_proto::v0_37::types::BlockId>,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub block: ::core::option::Option<::tendermint_proto::v0_37::types::Block>,
     #[doc = " pagination defines a pagination for the response."]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        C: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        D: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for GetBlockWithTxsResponse<A, BB, C, D>
 {
     const NAME: &'static str = "GetBlockWithTxsResponse";
@@ -1345,88 +723,20 @@ impl ::prost::Name for TxDecodeRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct TxDecodeResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    C: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    D: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " tx is the decoded transaction."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tx: ::core::option::Option<Tx<A, BB, C, D>>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        C: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        D: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for TxDecodeResponse<A, BB, C, D>
 {
     const NAME: &'static str = "TxDecodeResponse";
@@ -1443,88 +753,20 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct TxEncodeRequest<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    C: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    D: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " tx is the transaction to encode."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tx: ::core::option::Option<Tx<A, BB, C, D>>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        C: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        D: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for TxEncodeRequest<A, BB, C, D>
 {
     const NAME: &'static str = "TxEncodeRequest";
diff --git a/packages/proto/src/gen/cosmos.upgrade.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.upgrade.v1beta1.abstract.rs
index 1596f6a..da2aa7c 100644
--- a/packages/proto/src/gen/cosmos.upgrade.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.upgrade.v1beta1.abstract.rs
@@ -2,17 +2,7 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Plan<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Plan<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " Sets the name for the upgrade. This name will be used by the upgraded"]
     #[doc = " version of the software to apply any special \"on-upgrade\" commands during"]
     #[doc = " the first BeginBlock method after the upgrade is applied. It is also used"]
@@ -40,23 +30,10 @@ pub struct Plan<
     #[doc = " If this field is not empty, an error will be thrown."]
     #[deprecated]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub upgraded_client_state: ::core::option::Option<A>,
+    pub upgraded_client_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Plan<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Plan<A>
 {
     const NAME: &'static str = "Plan";
     const PACKAGE: &'static str = "cosmos.upgrade.v1beta1";
@@ -72,15 +49,7 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct SoftwareUpgradeProposal<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " title of the proposal"]
     #[prost(string, tag = "1")]
@@ -90,23 +59,10 @@ pub struct SoftwareUpgradeProposal<
     pub description: ::prost::alloc::string::String,
     #[doc = " plan of the proposal"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub plan: ::core::option::Option<Plan<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for SoftwareUpgradeProposal<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for SoftwareUpgradeProposal<A>
 {
     const NAME: &'static str = "SoftwareUpgradeProposal";
     const PACKAGE: &'static str = "cosmos.upgrade.v1beta1";
@@ -176,35 +132,14 @@ impl ::prost::Name for QueryCurrentPlanRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryCurrentPlanResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " plan is the current upgrade plan."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub plan: ::core::option::Option<Plan<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryCurrentPlanResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryCurrentPlanResponse<A>
 {
     const NAME: &'static str = "QueryCurrentPlanResponse";
     const PACKAGE: &'static str = "cosmos.upgrade.v1beta1";
@@ -312,10 +247,6 @@ impl ::prost::Name for QueryModuleVersionsRequest {
 pub struct QueryModuleVersionsResponse {
     #[doc = " module_versions is a list of module names with their consensus versions."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub module_versions: ::prost::alloc::vec::Vec<ModuleVersion>,
 }
 impl ::prost::Name for QueryModuleVersionsResponse {
@@ -363,38 +294,17 @@ impl ::prost::Name for QueryAuthorityResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgSoftwareUpgrade<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " authority is the address that controls the module (defaults to x/gov unless overwritten)."]
     #[prost(string, tag = "1")]
     pub authority: ::prost::alloc::string::String,
     #[doc = " plan is the upgrade plan."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub plan: ::core::option::Option<Plan<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgSoftwareUpgrade<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgSoftwareUpgrade<A>
 {
     const NAME: &'static str = "MsgSoftwareUpgrade";
     const PACKAGE: &'static str = "cosmos.upgrade.v1beta1";
diff --git a/packages/proto/src/gen/cosmos.vesting.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.vesting.v1beta1.abstract.rs
index 8ccfb89..6c8e68e 100644
--- a/packages/proto/src/gen/cosmos.vesting.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.vesting.v1beta1.abstract.rs
@@ -4,55 +4,22 @@
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct BaseVestingAccount<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub base_account: ::core::option::Option<super::super::auth::v1beta1::BaseAccount<A>>,
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub original_vesting: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub delegated_free: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub delegated_vesting: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " Vesting end time, as unix timestamp (in seconds)."]
     #[prost(int64, tag = "5")]
     pub end_time: i64,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for BaseVestingAccount<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for BaseVestingAccount<A>
 {
     const NAME: &'static str = "BaseVestingAccount";
     const PACKAGE: &'static str = "cosmos.vesting.v1beta1";
@@ -66,37 +33,16 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ContinuousVestingAccount<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub base_vesting_account: ::core::option::Option<BaseVestingAccount<A>>,
     #[doc = " Vesting start time, as unix timestamp (in seconds)."]
     #[prost(int64, tag = "2")]
     pub start_time: i64,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ContinuousVestingAccount<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ContinuousVestingAccount<A>
 {
     const NAME: &'static str = "ContinuousVestingAccount";
     const PACKAGE: &'static str = "cosmos.vesting.v1beta1";
@@ -111,34 +57,13 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct DelayedVestingAccount<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub base_vesting_account: ::core::option::Option<BaseVestingAccount<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for DelayedVestingAccount<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for DelayedVestingAccount<A>
 {
     const NAME: &'static str = "DelayedVestingAccount";
     const PACKAGE: &'static str = "cosmos.vesting.v1beta1";
@@ -155,10 +80,6 @@ pub struct Period {
     #[prost(int64, tag = "1")]
     pub length: i64,
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub amount: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
 }
 impl ::prost::Name for Period {
@@ -174,42 +95,17 @@ impl ::prost::Name for Period {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct PeriodicVestingAccount<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub base_vesting_account: ::core::option::Option<BaseVestingAccount<A>>,
     #[prost(int64, tag = "2")]
     pub start_time: i64,
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub vesting_periods: ::prost::alloc::vec::Vec<Period>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for PeriodicVestingAccount<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for PeriodicVestingAccount<A>
 {
     const NAME: &'static str = "PeriodicVestingAccount";
     const PACKAGE: &'static str = "cosmos.vesting.v1beta1";
@@ -226,34 +122,13 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct PermanentLockedAccount<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub base_vesting_account: ::core::option::Option<BaseVestingAccount<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for PermanentLockedAccount<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for PermanentLockedAccount<A>
 {
     const NAME: &'static str = "PermanentLockedAccount";
     const PACKAGE: &'static str = "cosmos.vesting.v1beta1";
@@ -272,10 +147,6 @@ pub struct MsgCreateVestingAccount {
     #[prost(string, tag = "2")]
     pub to_address: ::prost::alloc::string::String,
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub amount: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
     #[doc = " end of vesting as unix time (in seconds)."]
     #[prost(int64, tag = "4")]
@@ -315,10 +186,6 @@ pub struct MsgCreatePermanentLockedAccount {
     #[prost(string, tag = "2")]
     pub to_address: ::prost::alloc::string::String,
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub amount: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
 }
 impl ::prost::Name for MsgCreatePermanentLockedAccount {
@@ -358,10 +225,6 @@ pub struct MsgCreatePeriodicVestingAccount {
     #[prost(int64, tag = "3")]
     pub start_time: i64,
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub vesting_periods: ::prost::alloc::vec::Vec<Period>,
 }
 impl ::prost::Name for MsgCreatePeriodicVestingAccount {
diff --git a/packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs b/packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs
index ae35b05..c3312af 100644
--- a/packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs
+++ b/packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs
@@ -36,10 +36,6 @@ impl ::prost::Name for AccessConfig {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct Params {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub code_upload_access: ::core::option::Option<AccessConfig>,
     #[prost(enumeration = "AccessType", tag = "2")]
     pub instantiate_default_permission: i32,
@@ -64,10 +60,6 @@ pub struct CodeInfo {
     pub creator: ::prost::alloc::string::String,
     #[doc = " InstantiateConfig access control to apply on contract creation, optional"]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_config: ::core::option::Option<AccessConfig>,
 }
 impl ::prost::Name for CodeInfo {
@@ -81,17 +73,8 @@ impl ::prost::Name for CodeInfo {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ContractInfo<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct ContractInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[doc = " CodeID is the reference to the stored Wasm code"]
     #[prost(uint64, tag = "1")]
     pub code_id: u64,
@@ -106,33 +89,16 @@ pub struct ContractInfo<
     pub label: ::prost::alloc::string::String,
     #[doc = " Created Tx position when the contract was instantiated."]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub created: ::core::option::Option<AbsoluteTxPosition>,
     #[prost(string, tag = "6")]
     pub ibc_port_id: ::prost::alloc::string::String,
     #[doc = " Extension is an extension point to store custom metadata within the"]
     #[doc = " persistence model."]
     #[prost(message, optional, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub extension: ::core::option::Option<A>,
+    pub extension: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ContractInfo<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ContractInfo<A>
 {
     const NAME: &'static str = "ContractInfo";
     const PACKAGE: &'static str = "cosmwasm.wasm.v1";
@@ -152,10 +118,6 @@ pub struct ContractCodeHistoryEntry {
     pub code_id: u64,
     #[doc = " Updated Tx position when the operation was executed."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub updated: ::core::option::Option<AbsoluteTxPosition>,
     #[prost(bytes = "vec", tag = "4")]
     pub msg: ::prost::alloc::vec::Vec<u8>,
@@ -319,10 +281,6 @@ impl ContractCodeHistoryOperationType {
 pub struct StoreCodeAuthorization {
     #[doc = " Grants for code upload"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub grants: ::prost::alloc::vec::Vec<CodeGrant>,
 }
 impl ::prost::Name for StoreCodeAuthorization {
@@ -338,52 +296,16 @@ impl ::prost::Name for StoreCodeAuthorization {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ContractExecutionAuthorization<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " Grants for contract executions"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub grants: ::prost::alloc::vec::Vec<ContractGrant<A, BB>>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for ContractExecutionAuthorization<A, BB>
 {
     const NAME: &'static str = "ContractExecutionAuthorization";
@@ -398,52 +320,16 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ContractMigrationAuthorization<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " Grants for contract migrations"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub grants: ::prost::alloc::vec::Vec<ContractGrant<A, BB>>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for ContractMigrationAuthorization<A, BB>
 {
     const NAME: &'static str = "ContractMigrationAuthorization";
@@ -465,10 +351,6 @@ pub struct CodeGrant {
     #[doc = " on contract creation."]
     #[doc = " Optional"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
 }
 impl ::prost::Name for CodeGrant {
@@ -484,24 +366,8 @@ impl ::prost::Name for CodeGrant {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ContractGrant<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " Contract is the bech32 address of the smart contract"]
     #[prost(string, tag = "1")]
@@ -509,40 +375,16 @@ pub struct ContractGrant<
     #[doc = " Limit defines execution limits that are enforced and updated when the grant"]
     #[doc = " is applied. When the limit lapsed the grant is removed."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub limit: ::core::option::Option<A>,
+    pub limit: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " Filter define more fine-grained control on the message payload passed"]
     #[doc = " to the contract in the operation. When no filter applies on execution, the"]
     #[doc = " operation is prohibited."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub filter: ::core::option::Option<BB>,
+    pub filter: ::core::option::Option<crate::any::Any<BB>>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for ContractGrant<A, BB>
 {
     const NAME: &'static str = "ContractGrant";
@@ -576,10 +418,6 @@ impl ::prost::Name for MaxCallsLimit {
 pub struct MaxFundsLimit {
     #[doc = " Amounts is the maximal amount of tokens transferable to the contract."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub amounts: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
 }
 impl ::prost::Name for MaxFundsLimit {
@@ -601,10 +439,6 @@ pub struct CombinedLimit {
     pub calls_remaining: u64,
     #[doc = " Amounts is the maximal amount of tokens transferable to the contract."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub amounts: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
 }
 impl ::prost::Name for CombinedLimit {
@@ -668,53 +502,19 @@ impl ::prost::Name for AcceptedMessagesFilter {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub codes: ::prost::alloc::vec::Vec<Code>,
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub contracts: ::prost::alloc::vec::Vec<Contract<A>>,
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub sequences: ::prost::alloc::vec::Vec<Sequence>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GenesisState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
     const PACKAGE: &'static str = "cosmwasm.wasm.v1";
@@ -730,10 +530,6 @@ pub struct Code {
     #[prost(uint64, tag = "1")]
     pub code_id: u64,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub code_info: ::core::option::Option<CodeInfo>,
     #[prost(bytes = "vec", tag = "3")]
     pub code_bytes: ::prost::alloc::vec::Vec<u8>,
@@ -752,49 +548,18 @@ impl ::prost::Name for Code {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Contract<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Contract<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[prost(string, tag = "1")]
     pub contract_address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub contract_info: ::core::option::Option<ContractInfo<A>>,
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub contract_state: ::prost::alloc::vec::Vec<Model>,
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub contract_code_history: ::prost::alloc::vec::Vec<ContractCodeHistoryEntry>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Contract<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Contract<A>
 {
     const NAME: &'static str = "Contract";
     const PACKAGE: &'static str = "cosmwasm.wasm.v1";
@@ -900,10 +665,6 @@ pub struct StoreCodeProposal {
     pub wasm_byte_code: ::prost::alloc::vec::Vec<u8>,
     #[doc = " InstantiatePermission to apply on contract creation, optional"]
     #[prost(message, optional, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
     #[doc = " UnpinCode code on upload, optional"]
     #[prost(bool, tag = "8")]
@@ -958,10 +719,6 @@ pub struct InstantiateContractProposal {
     pub msg: ::prost::alloc::vec::Vec<u8>,
     #[doc = " Funds coins that are transferred to the contract on instantiation"]
     #[prost(message, repeated, tag = "8")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub funds: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
 }
 impl ::prost::Name for InstantiateContractProposal {
@@ -1002,10 +759,6 @@ pub struct InstantiateContract2Proposal {
     pub msg: ::prost::alloc::vec::Vec<u8>,
     #[doc = " Funds coins that are transferred to the contract on instantiation"]
     #[prost(message, repeated, tag = "8")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub funds: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
     #[doc = " Salt is an arbitrary value provided by the sender. Size can be 1 to 64."]
     #[prost(bytes = "vec", tag = "9")]
@@ -1108,10 +861,6 @@ pub struct ExecuteContractProposal {
     pub msg: ::prost::alloc::vec::Vec<u8>,
     #[doc = " Funds coins that are transferred to the contract on instantiation"]
     #[prost(message, repeated, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub funds: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
 }
 impl ::prost::Name for ExecuteContractProposal {
@@ -1235,10 +984,6 @@ pub struct AccessConfigUpdate {
     pub code_id: u64,
     #[doc = " InstantiatePermission to apply to the set of code ids"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
 }
 impl ::prost::Name for AccessConfigUpdate {
@@ -1265,10 +1010,6 @@ pub struct UpdateInstantiateConfigProposal {
     #[doc = " AccessConfigUpdate contains the list of code ids and the access config"]
     #[doc = " to be applied."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub access_config_updates: ::prost::alloc::vec::Vec<AccessConfigUpdate>,
 }
 impl ::prost::Name for UpdateInstantiateConfigProposal {
@@ -1300,10 +1041,6 @@ pub struct StoreAndInstantiateContractProposal {
     pub wasm_byte_code: ::prost::alloc::vec::Vec<u8>,
     #[doc = " InstantiatePermission to apply on contract creation, optional"]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
     #[doc = " UnpinCode code on upload, optional"]
     #[prost(bool, tag = "6")]
@@ -1319,10 +1056,6 @@ pub struct StoreAndInstantiateContractProposal {
     pub msg: ::prost::alloc::vec::Vec<u8>,
     #[doc = " Funds coins that are transferred to the contract on instantiation"]
     #[prost(message, repeated, tag = "10")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub funds: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
     #[doc = " Source is the URL where the code is hosted"]
     #[prost(string, tag = "11")]
@@ -1366,37 +1099,16 @@ impl ::prost::Name for QueryContractInfoRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryContractInfoResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " address is the address of the contract"]
     #[prost(string, tag = "1")]
     pub address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub contract_info: ::core::option::Option<ContractInfo<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryContractInfoResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryContractInfoResponse<A>
 {
     const NAME: &'static str = "QueryContractInfoResponse";
     const PACKAGE: &'static str = "cosmwasm.wasm.v1";
@@ -1415,10 +1127,6 @@ pub struct QueryContractHistoryRequest {
     pub address: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageRequest>,
 }
@@ -1436,17 +1144,9 @@ impl ::prost::Name for QueryContractHistoryRequest {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryContractHistoryResponse {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub entries: ::prost::alloc::vec::Vec<ContractCodeHistoryEntry>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageResponse>,
 }
@@ -1468,10 +1168,6 @@ pub struct QueryContractsByCodeRequest {
     pub code_id: u64,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageRequest>,
 }
@@ -1493,10 +1189,6 @@ pub struct QueryContractsByCodeResponse {
     pub contracts: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageResponse>,
 }
@@ -1518,10 +1210,6 @@ pub struct QueryAllContractStateRequest {
     pub address: ::prost::alloc::string::String,
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageRequest>,
 }
@@ -1539,17 +1227,9 @@ impl ::prost::Name for QueryAllContractStateRequest {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryAllContractStateResponse {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub models: ::prost::alloc::vec::Vec<Model>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageResponse>,
 }
@@ -1662,10 +1342,6 @@ pub struct CodeInfoResponse {
     #[prost(bytes = "vec", tag = "3")]
     pub data_hash: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
 }
 impl ::prost::Name for CodeInfoResponse {
@@ -1681,10 +1357,6 @@ impl ::prost::Name for CodeInfoResponse {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryCodeResponse {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub code_info: ::core::option::Option<CodeInfoResponse>,
     #[prost(bytes = "vec", tag = "2")]
     pub data: ::prost::alloc::vec::Vec<u8>,
@@ -1703,10 +1375,6 @@ impl ::prost::Name for QueryCodeResponse {
 pub struct QueryCodesRequest {
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageRequest>,
 }
@@ -1723,17 +1391,9 @@ impl ::prost::Name for QueryCodesRequest {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryCodesResponse {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub code_infos: ::prost::alloc::vec::Vec<CodeInfoResponse>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageResponse>,
 }
@@ -1752,10 +1412,6 @@ impl ::prost::Name for QueryCodesResponse {
 pub struct QueryPinnedCodesRequest {
     #[doc = " pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageRequest>,
 }
@@ -1776,10 +1432,6 @@ pub struct QueryPinnedCodesResponse {
     pub code_ids: ::prost::alloc::vec::Vec<u64>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageResponse>,
 }
@@ -1809,10 +1461,6 @@ impl ::prost::Name for QueryParamsRequest {
 pub struct QueryParamsResponse {
     #[doc = " params defines the parameters of the module."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for QueryParamsResponse {
@@ -1833,10 +1481,6 @@ pub struct QueryContractsByCreatorRequest {
     pub creator_address: ::prost::alloc::string::String,
     #[doc = " Pagination defines an optional pagination for the request."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageRequest>,
 }
@@ -1858,10 +1502,6 @@ pub struct QueryContractsByCreatorResponse {
     pub contract_addresses: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
     #[doc = " Pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageResponse>,
 }
@@ -1886,10 +1526,6 @@ pub struct MsgStoreCode {
     #[doc = " InstantiatePermission access control to apply on contract creation,"]
     #[doc = " optional"]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
 }
 impl ::prost::Name for MsgStoreCode {
@@ -1941,10 +1577,6 @@ pub struct MsgInstantiateContract {
     pub msg: ::prost::alloc::vec::Vec<u8>,
     #[doc = " Funds coins that are transferred to the contract on instantiation"]
     #[prost(message, repeated, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub funds: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
 }
 impl ::prost::Name for MsgInstantiateContract {
@@ -1996,10 +1628,6 @@ pub struct MsgInstantiateContract2 {
     pub msg: ::prost::alloc::vec::Vec<u8>,
     #[doc = " Funds coins that are transferred to the contract on instantiation"]
     #[prost(message, repeated, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub funds: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
     #[doc = " Salt is an arbitrary value provided by the sender. Size can be 1 to 64."]
     #[prost(bytes = "vec", tag = "7")]
@@ -2051,10 +1679,6 @@ pub struct MsgExecuteContract {
     pub msg: ::prost::alloc::vec::Vec<u8>,
     #[doc = " Funds coins that are transferred to the contract on execution"]
     #[prost(message, repeated, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub funds: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
 }
 impl ::prost::Name for MsgExecuteContract {
@@ -2200,10 +1824,6 @@ pub struct MsgUpdateInstantiateConfig {
     pub code_id: u64,
     #[doc = " NewInstantiatePermission is the new access control"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub new_instantiate_permission: ::core::option::Option<AccessConfig>,
 }
 impl ::prost::Name for MsgUpdateInstantiateConfig {
@@ -2239,10 +1859,6 @@ pub struct MsgUpdateParams {
     #[doc = ""]
     #[doc = " NOTE: All parameters must be supplied."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for MsgUpdateParams {
@@ -2398,10 +2014,6 @@ pub struct MsgStoreAndInstantiateContract {
     pub wasm_byte_code: ::prost::alloc::vec::Vec<u8>,
     #[doc = " InstantiatePermission to apply on contract creation, optional"]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
     #[doc = " UnpinCode code on upload, optional. As default the uploaded contract is"]
     #[doc = " pinned to cache."]
@@ -2419,10 +2031,6 @@ pub struct MsgStoreAndInstantiateContract {
     #[doc = " Funds coins that are transferred from the authority account to the contract"]
     #[doc = " on instantiation"]
     #[prost(message, repeated, tag = "9")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub funds: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
     #[doc = " Source is the URL where the code is hosted"]
     #[prost(string, tag = "10")]
@@ -2545,10 +2153,6 @@ pub struct MsgStoreAndMigrateContract {
     pub wasm_byte_code: ::prost::alloc::vec::Vec<u8>,
     #[doc = " InstantiatePermission to apply on contract creation, optional"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
     #[doc = " Contract is the address of the smart contract"]
     #[prost(string, tag = "4")]
diff --git a/packages/proto/src/gen/ibc.applications.interchain_accounts.v1.abstract.rs b/packages/proto/src/gen/ibc.applications.interchain_accounts.v1.abstract.rs
index 6b7ac25..7fa5417 100644
--- a/packages/proto/src/gen/ibc.applications.interchain_accounts.v1.abstract.rs
+++ b/packages/proto/src/gen/ibc.applications.interchain_accounts.v1.abstract.rs
@@ -21,35 +21,12 @@ impl ::prost::Name for InterchainAccountPacketData {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct CosmosTx<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct CosmosTx<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub messages: ::prost::alloc::vec::Vec<A>,
+    pub messages: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for CosmosTx<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for CosmosTx<A>
 {
     const NAME: &'static str = "CosmosTx";
     const PACKAGE: &'static str = "ibc.applications.interchain_accounts.v1";
@@ -104,37 +81,16 @@ impl Type {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct InterchainAccount<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub base_account:
         ::core::option::Option<super::super::super::super::cosmos::auth::v1beta1::BaseAccount<A>>,
     #[prost(string, tag = "2")]
     pub account_owner: ::prost::alloc::string::String,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for InterchainAccount<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for InterchainAccount<A>
 {
     const NAME: &'static str = "InterchainAccount";
     const PACKAGE: &'static str = "ibc.applications.interchain_accounts.v1";
diff --git a/packages/proto/src/gen/ibc.core.channel.v1.abstract.rs b/packages/proto/src/gen/ibc.core.channel.v1.abstract.rs
index 017d7a8..1edaf5c 100644
--- a/packages/proto/src/gen/ibc.core.channel.v1.abstract.rs
+++ b/packages/proto/src/gen/ibc.core.channel.v1.abstract.rs
@@ -13,10 +13,6 @@ pub struct Channel {
     pub ordering: i32,
     #[doc = " counterparty channel end"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub counterparty: ::core::option::Option<Counterparty>,
     #[doc = " list of connection identifiers, in order, along which packets sent on"]
     #[doc = " this channel will travel"]
@@ -47,10 +43,6 @@ pub struct IdentifiedChannel {
     pub ordering: i32,
     #[doc = " counterparty channel end"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub counterparty: ::core::option::Option<Counterparty>,
     #[doc = " list of connection identifiers, in order, along which packets sent on"]
     #[doc = " this channel will travel"]
@@ -119,10 +111,6 @@ pub struct Packet {
     pub data: ::prost::alloc::vec::Vec<u8>,
     #[doc = " block height after which the packet times out"]
     #[prost(message, optional, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub timeout_height: ::core::option::Option<super::super::client::v1::Height>,
     #[doc = " block timestamp (in nanoseconds) after which the packet times out"]
     #[prost(uint64, tag = "8")]
@@ -330,46 +318,18 @@ impl Order {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GenesisState {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub channels: ::prost::alloc::vec::Vec<IdentifiedChannel>,
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub acknowledgements: ::prost::alloc::vec::Vec<PacketState>,
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub commitments: ::prost::alloc::vec::Vec<PacketState>,
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub receipts: ::prost::alloc::vec::Vec<PacketState>,
     #[prost(message, repeated, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub send_sequences: ::prost::alloc::vec::Vec<PacketSequence>,
     #[prost(message, repeated, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub recv_sequences: ::prost::alloc::vec::Vec<PacketSequence>,
     #[prost(message, repeated, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub ack_sequences: ::prost::alloc::vec::Vec<PacketSequence>,
     #[doc = " the sequence for the next generated channel identifier"]
     #[prost(uint64, tag = "8")]
@@ -430,20 +390,12 @@ impl ::prost::Name for QueryChannelRequest {
 pub struct QueryChannelResponse {
     #[doc = " channel associated with the request identifiers"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub channel: ::core::option::Option<Channel>,
     #[doc = " merkle proof of existence"]
     #[prost(bytes = "vec", tag = "2")]
     pub proof: ::prost::alloc::vec::Vec<u8>,
     #[doc = " height at which the proof was retrieved"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryChannelResponse {
@@ -460,10 +412,6 @@ impl ::prost::Name for QueryChannelResponse {
 pub struct QueryChannelsRequest {
     #[doc = " pagination request"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageRequest,
     >,
@@ -482,26 +430,14 @@ impl ::prost::Name for QueryChannelsRequest {
 pub struct QueryChannelsResponse {
     #[doc = " list of stored channels of the chain."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub channels: ::prost::alloc::vec::Vec<IdentifiedChannel>,
     #[doc = " pagination response"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageResponse,
     >,
     #[doc = " query block height"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryChannelsResponse {
@@ -522,10 +458,6 @@ pub struct QueryConnectionChannelsRequest {
     pub connection: ::prost::alloc::string::String,
     #[doc = " pagination request"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageRequest,
     >,
@@ -545,26 +477,14 @@ impl ::prost::Name for QueryConnectionChannelsRequest {
 pub struct QueryConnectionChannelsResponse {
     #[doc = " list of channels associated with a connection."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub channels: ::prost::alloc::vec::Vec<IdentifiedChannel>,
     #[doc = " pagination response"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageResponse,
     >,
     #[doc = " query block height"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryConnectionChannelsResponse {
@@ -600,22 +520,10 @@ impl ::prost::Name for QueryChannelClientStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryChannelClientStateResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " client state associated with the channel"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub identified_client_state:
         ::core::option::Option<super::super::client::v1::IdentifiedClientState<A>>,
     #[doc = " merkle proof of existence"]
@@ -623,23 +531,10 @@ pub struct QueryChannelClientStateResponse<
     pub proof: ::prost::alloc::vec::Vec<u8>,
     #[doc = " height at which the proof was retrieved"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryChannelClientStateResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryChannelClientStateResponse<A>
 {
     const NAME: &'static str = "QueryChannelClientStateResponse";
     const PACKAGE: &'static str = "ibc.core.channel.v1";
@@ -679,23 +574,11 @@ impl ::prost::Name for QueryChannelConsensusStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryChannelConsensusStateResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " consensus state associated with the channel"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub consensus_state: ::core::option::Option<A>,
+    pub consensus_state: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " client ID associated with the consensus state"]
     #[prost(string, tag = "2")]
     pub client_id: ::prost::alloc::string::String,
@@ -704,23 +587,10 @@ pub struct QueryChannelConsensusStateResponse<
     pub proof: ::prost::alloc::vec::Vec<u8>,
     #[doc = " height at which the proof was retrieved"]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryChannelConsensusStateResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryChannelConsensusStateResponse<A>
 {
     const NAME: &'static str = "QueryChannelConsensusStateResponse";
     const PACKAGE: &'static str = "ibc.core.channel.v1";
@@ -766,10 +636,6 @@ pub struct QueryPacketCommitmentResponse {
     pub proof: ::prost::alloc::vec::Vec<u8>,
     #[doc = " height at which the proof was retrieved"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryPacketCommitmentResponse {
@@ -793,10 +659,6 @@ pub struct QueryPacketCommitmentsRequest {
     pub channel_id: ::prost::alloc::string::String,
     #[doc = " pagination request"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageRequest,
     >,
@@ -815,26 +677,14 @@ impl ::prost::Name for QueryPacketCommitmentsRequest {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryPacketCommitmentsResponse {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub commitments: ::prost::alloc::vec::Vec<PacketState>,
     #[doc = " pagination response"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageResponse,
     >,
     #[doc = " query block height"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryPacketCommitmentsResponse {
@@ -882,10 +732,6 @@ pub struct QueryPacketReceiptResponse {
     pub proof: ::prost::alloc::vec::Vec<u8>,
     #[doc = " height at which the proof was retrieved"]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryPacketReceiptResponse {
@@ -933,10 +779,6 @@ pub struct QueryPacketAcknowledgementResponse {
     pub proof: ::prost::alloc::vec::Vec<u8>,
     #[doc = " height at which the proof was retrieved"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryPacketAcknowledgementResponse {
@@ -960,10 +802,6 @@ pub struct QueryPacketAcknowledgementsRequest {
     pub channel_id: ::prost::alloc::string::String,
     #[doc = " pagination request"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageRequest,
     >,
@@ -985,26 +823,14 @@ impl ::prost::Name for QueryPacketAcknowledgementsRequest {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryPacketAcknowledgementsResponse {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub acknowledgements: ::prost::alloc::vec::Vec<PacketState>,
     #[doc = " pagination response"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageResponse,
     >,
     #[doc = " query block height"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryPacketAcknowledgementsResponse {
@@ -1048,10 +874,6 @@ pub struct QueryUnreceivedPacketsResponse {
     pub sequences: ::prost::alloc::vec::Vec<u64>,
     #[doc = " query block height"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryUnreceivedPacketsResponse {
@@ -1095,10 +917,6 @@ pub struct QueryUnreceivedAcksResponse {
     pub sequences: ::prost::alloc::vec::Vec<u64>,
     #[doc = " query block height"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryUnreceivedAcksResponse {
@@ -1142,10 +960,6 @@ pub struct QueryNextSequenceReceiveResponse {
     pub proof: ::prost::alloc::vec::Vec<u8>,
     #[doc = " height at which the proof was retrieved"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryNextSequenceReceiveResponse {
@@ -1164,10 +978,6 @@ pub struct MsgChannelOpenInit {
     #[prost(string, tag = "1")]
     pub port_id: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub channel: ::core::option::Option<Channel>,
     #[prost(string, tag = "3")]
     pub signer: ::prost::alloc::string::String,
@@ -1211,20 +1021,12 @@ pub struct MsgChannelOpenTry {
     pub previous_channel_id: ::prost::alloc::string::String,
     #[doc = " NOTE: the version field within the channel has been deprecated. Its value will be ignored by core IBC."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub channel: ::core::option::Option<Channel>,
     #[prost(string, tag = "4")]
     pub counterparty_version: ::prost::alloc::string::String,
     #[prost(bytes = "vec", tag = "5")]
     pub proof_init: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
     #[prost(string, tag = "7")]
     pub signer: ::prost::alloc::string::String,
@@ -1270,10 +1072,6 @@ pub struct MsgChannelOpenAck {
     #[prost(bytes = "vec", tag = "5")]
     pub proof_try: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
     #[prost(string, tag = "7")]
     pub signer: ::prost::alloc::string::String,
@@ -1310,10 +1108,6 @@ pub struct MsgChannelOpenConfirm {
     #[prost(bytes = "vec", tag = "3")]
     pub proof_ack: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
     #[prost(string, tag = "5")]
     pub signer: ::prost::alloc::string::String,
@@ -1383,10 +1177,6 @@ pub struct MsgChannelCloseConfirm {
     #[prost(bytes = "vec", tag = "3")]
     pub proof_init: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
     #[prost(string, tag = "5")]
     pub signer: ::prost::alloc::string::String,
@@ -1417,18 +1207,10 @@ impl ::prost::Name for MsgChannelCloseConfirmResponse {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgRecvPacket {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub packet: ::core::option::Option<Packet>,
     #[prost(bytes = "vec", tag = "2")]
     pub proof_commitment: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
     #[prost(string, tag = "4")]
     pub signer: ::prost::alloc::string::String,
@@ -1461,18 +1243,10 @@ impl ::prost::Name for MsgRecvPacketResponse {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgTimeout {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub packet: ::core::option::Option<Packet>,
     #[prost(bytes = "vec", tag = "2")]
     pub proof_unreceived: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
     #[prost(uint64, tag = "4")]
     pub next_sequence_recv: u64,
@@ -1507,20 +1281,12 @@ impl ::prost::Name for MsgTimeoutResponse {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgTimeoutOnClose {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub packet: ::core::option::Option<Packet>,
     #[prost(bytes = "vec", tag = "2")]
     pub proof_unreceived: ::prost::alloc::vec::Vec<u8>,
     #[prost(bytes = "vec", tag = "3")]
     pub proof_close: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
     #[prost(uint64, tag = "5")]
     pub next_sequence_recv: u64,
@@ -1555,20 +1321,12 @@ impl ::prost::Name for MsgTimeoutOnCloseResponse {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgAcknowledgement {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub packet: ::core::option::Option<Packet>,
     #[prost(bytes = "vec", tag = "2")]
     pub acknowledgement: ::prost::alloc::vec::Vec<u8>,
     #[prost(bytes = "vec", tag = "3")]
     pub proof_acked: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
     #[prost(string, tag = "5")]
     pub signer: ::prost::alloc::string::String,
diff --git a/packages/proto/src/gen/ibc.core.client.v1.abstract.rs b/packages/proto/src/gen/ibc.core.client.v1.abstract.rs
index 1e930f4..2723185 100644
--- a/packages/proto/src/gen/ibc.core.client.v1.abstract.rs
+++ b/packages/proto/src/gen/ibc.core.client.v1.abstract.rs
@@ -4,38 +4,17 @@
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct IdentifiedClientState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " client identifier"]
     #[prost(string, tag = "1")]
     pub client_id: ::prost::alloc::string::String,
     #[doc = " client state"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub client_state: ::core::option::Option<A>,
+    pub client_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for IdentifiedClientState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for IdentifiedClientState<A>
 {
     const NAME: &'static str = "IdentifiedClientState";
     const PACKAGE: &'static str = "ibc.core.client.v1";
@@ -49,42 +28,17 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ConsensusStateWithHeight<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " consensus state height"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub height: ::core::option::Option<Height>,
     #[doc = " consensus state"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub consensus_state: ::core::option::Option<A>,
+    pub consensus_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ConsensusStateWithHeight<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ConsensusStateWithHeight<A>
 {
     const NAME: &'static str = "ConsensusStateWithHeight";
     const PACKAGE: &'static str = "ibc.core.client.v1";
@@ -98,38 +52,17 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ClientConsensusStates<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " client identifier"]
     #[prost(string, tag = "1")]
     pub client_id: ::prost::alloc::string::String,
     #[doc = " consensus states and their heights associated with the client"]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub consensus_states: ::prost::alloc::vec::Vec<ConsensusStateWithHeight<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ClientConsensusStates<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ClientConsensusStates<A>
 {
     const NAME: &'static str = "ClientConsensusStates";
     const PACKAGE: &'static str = "ibc.core.client.v1";
@@ -172,34 +105,14 @@ impl ::prost::Name for ClientUpdateProposal {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct UpgradeProposal<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(string, tag = "1")]
     pub title: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
     pub description: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub plan: ::core::option::Option<super::super::super::super::cosmos::upgrade::v1beta1::Plan<A>>,
     #[doc = " An UpgradedClientState must be provided to perform an IBC breaking upgrade."]
     #[doc = " This will make the chain commit to the correct upgraded (self) client state"]
@@ -208,31 +121,11 @@ pub struct UpgradeProposal<
     #[doc = " of the chain. This will allow IBC connections to persist smoothly across"]
     #[doc = " planned chain upgrades"]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub upgraded_client_state: ::core::option::Option<BB>,
+    pub upgraded_client_state: ::core::option::Option<crate::any::Any<BB>>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for UpgradeProposal<A, BB>
 {
     const NAME: &'static str = "UpgradeProposal";
@@ -292,51 +185,19 @@ impl ::prost::Name for Params {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " client states with their corresponding identifiers"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub clients: ::prost::alloc::vec::Vec<IdentifiedClientState<A>>,
     #[doc = " consensus states from each client"]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub clients_consensus: ::prost::alloc::vec::Vec<ClientConsensusStates<BB>>,
     #[doc = " metadata from each client"]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub clients_metadata: ::prost::alloc::vec::Vec<IdentifiedGenesisMetadata>,
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
     #[doc = " create localhost on initialization"]
     #[prost(bool, tag = "5")]
@@ -346,24 +207,8 @@ pub struct GenesisState<
     pub next_client_sequence: u64,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for GenesisState<A, BB>
 {
     const NAME: &'static str = "GenesisState";
@@ -401,10 +246,6 @@ pub struct IdentifiedGenesisMetadata {
     #[prost(string, tag = "1")]
     pub client_id: ::prost::alloc::string::String,
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub client_metadata: ::prost::alloc::vec::Vec<GenesisMetadata>,
 }
 impl ::prost::Name for IdentifiedGenesisMetadata {
@@ -438,45 +279,20 @@ impl ::prost::Name for QueryClientStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryClientStateResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " client state associated with the request identifier"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub client_state: ::core::option::Option<A>,
+    pub client_state: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " merkle proof of existence"]
     #[prost(bytes = "vec", tag = "2")]
     pub proof: ::prost::alloc::vec::Vec<u8>,
     #[doc = " height at which the proof was retrieved"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<Height>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryClientStateResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryClientStateResponse<A>
 {
     const NAME: &'static str = "QueryClientStateResponse";
     const PACKAGE: &'static str = "ibc.core.client.v1";
@@ -492,10 +308,6 @@ impl<
 pub struct QueryClientStatesRequest {
     #[doc = " pagination request"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageRequest,
     >,
@@ -513,44 +325,19 @@ impl ::prost::Name for QueryClientStatesRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryClientStatesResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " list of stored ClientStates of the chain."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub client_states: ::prost::alloc::vec::Vec<IdentifiedClientState<A>>,
     #[doc = " pagination response"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageResponse,
     >,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryClientStatesResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryClientStatesResponse<A>
 {
     const NAME: &'static str = "QueryClientStatesResponse";
     const PACKAGE: &'static str = "ibc.core.client.v1";
@@ -592,45 +379,20 @@ impl ::prost::Name for QueryConsensusStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryConsensusStateResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " consensus state associated with the client identifier at the given height"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub consensus_state: ::core::option::Option<A>,
+    pub consensus_state: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " merkle proof of existence"]
     #[prost(bytes = "vec", tag = "2")]
     pub proof: ::prost::alloc::vec::Vec<u8>,
     #[doc = " height at which the proof was retrieved"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<Height>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryConsensusStateResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryConsensusStateResponse<A>
 {
     const NAME: &'static str = "QueryConsensusStateResponse";
     const PACKAGE: &'static str = "ibc.core.client.v1";
@@ -649,10 +411,6 @@ pub struct QueryConsensusStatesRequest {
     pub client_id: ::prost::alloc::string::String,
     #[doc = " pagination request"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageRequest,
     >,
@@ -670,44 +428,19 @@ impl ::prost::Name for QueryConsensusStatesRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryConsensusStatesResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " consensus states associated with the identifier"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub consensus_states: ::prost::alloc::vec::Vec<ConsensusStateWithHeight<A>>,
     #[doc = " pagination response"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageResponse,
     >,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryConsensusStatesResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryConsensusStatesResponse<A>
 {
     const NAME: &'static str = "QueryConsensusStatesResponse";
     const PACKAGE: &'static str = "ibc.core.client.v1";
@@ -726,10 +459,6 @@ pub struct QueryConsensusStateHeightsRequest {
     pub client_id: ::prost::alloc::string::String,
     #[doc = " pagination request"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageRequest,
     >,
@@ -749,17 +478,9 @@ impl ::prost::Name for QueryConsensusStateHeightsRequest {
 pub struct QueryConsensusStateHeightsResponse {
     #[doc = " consensus state heights"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub consensus_state_heights: ::prost::alloc::vec::Vec<Height>,
     #[doc = " pagination response"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageResponse,
     >,
@@ -825,10 +546,6 @@ impl ::prost::Name for QueryClientParamsRequest {
 pub struct QueryClientParamsResponse {
     #[doc = " params defines the parameters of the module."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for QueryClientParamsResponse {
@@ -857,35 +574,14 @@ impl ::prost::Name for QueryUpgradedClientStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryUpgradedClientStateResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " client state associated with the request identifier"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub upgraded_client_state: ::core::option::Option<A>,
+    pub upgraded_client_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryUpgradedClientStateResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryUpgradedClientStateResponse<A>
 {
     const NAME: &'static str = "QueryUpgradedClientStateResponse";
     const PACKAGE: &'static str = "ibc.core.client.v1";
@@ -912,35 +608,14 @@ impl ::prost::Name for QueryUpgradedConsensusStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryUpgradedConsensusStateResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " Consensus state associated with the request identifier"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub upgraded_consensus_state: ::core::option::Option<A>,
+    pub upgraded_consensus_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryUpgradedConsensusStateResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryUpgradedConsensusStateResponse<A>
 {
     const NAME: &'static str = "QueryUpgradedConsensusStateResponse";
     const PACKAGE: &'static str = "ibc.core.client.v1";
@@ -953,63 +628,23 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgCreateClient<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " light client state"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub client_state: ::core::option::Option<A>,
+    pub client_state: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " consensus state associated with the client that corresponds to a given"]
     #[doc = " height."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub consensus_state: ::core::option::Option<BB>,
+    pub consensus_state: ::core::option::Option<crate::any::Any<BB>>,
     #[doc = " signer address"]
     #[prost(string, tag = "3")]
     pub signer: ::prost::alloc::string::String,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for MsgCreateClient<A, BB>
 {
     const NAME: &'static str = "MsgCreateClient";
@@ -1036,41 +671,20 @@ impl ::prost::Name for MsgCreateClientResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgUpdateClient<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " client unique identifier"]
     #[prost(string, tag = "1")]
     pub client_id: ::prost::alloc::string::String,
     #[doc = " client message to update the light client"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub client_message: ::core::option::Option<A>,
+    pub client_message: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " signer address"]
     #[prost(string, tag = "3")]
     pub signer: ::prost::alloc::string::String,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgUpdateClient<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgUpdateClient<A>
 {
     const NAME: &'static str = "MsgUpdateClient";
     const PACKAGE: &'static str = "ibc.core.client.v1";
@@ -1096,43 +710,19 @@ impl ::prost::Name for MsgUpdateClientResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgUpgradeClient<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " client unique identifier"]
     #[prost(string, tag = "1")]
     pub client_id: ::prost::alloc::string::String,
     #[doc = " upgraded client state"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub client_state: ::core::option::Option<A>,
+    pub client_state: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " upgraded consensus state, only contains enough information to serve as a"]
     #[doc = " basis of trust in update logic"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub consensus_state: ::core::option::Option<BB>,
+    pub consensus_state: ::core::option::Option<crate::any::Any<BB>>,
     #[doc = " proof that old chain committed to new client"]
     #[prost(bytes = "vec", tag = "4")]
     pub proof_upgrade_client: ::prost::alloc::vec::Vec<u8>,
@@ -1144,24 +734,8 @@ pub struct MsgUpgradeClient<
     pub signer: ::prost::alloc::string::String,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for MsgUpgradeClient<A, BB>
 {
     const NAME: &'static str = "MsgUpgradeClient";
@@ -1189,15 +763,7 @@ impl ::prost::Name for MsgUpgradeClientResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgSubmitMisbehaviour<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " client unique identifier"]
     #[deprecated]
@@ -1206,27 +772,14 @@ pub struct MsgSubmitMisbehaviour<
     #[doc = " misbehaviour used for freezing the light client"]
     #[deprecated]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub misbehaviour: ::core::option::Option<A>,
+    pub misbehaviour: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " signer address"]
     #[deprecated]
     #[prost(string, tag = "3")]
     pub signer: ::prost::alloc::string::String,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgSubmitMisbehaviour<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgSubmitMisbehaviour<A>
 {
     const NAME: &'static str = "MsgSubmitMisbehaviour";
     const PACKAGE: &'static str = "ibc.core.client.v1";
diff --git a/packages/proto/src/gen/ibc.core.connection.v1.abstract.rs b/packages/proto/src/gen/ibc.core.connection.v1.abstract.rs
index 2fe67ed..9184452 100644
--- a/packages/proto/src/gen/ibc.core.connection.v1.abstract.rs
+++ b/packages/proto/src/gen/ibc.core.connection.v1.abstract.rs
@@ -12,20 +12,12 @@ pub struct ConnectionEnd {
     #[doc = " IBC version which can be utilised to determine encodings or protocols for"]
     #[doc = " channels or packets utilising this connection."]
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub versions: ::prost::alloc::vec::Vec<Version>,
     #[doc = " current state of the connection end."]
     #[prost(enumeration = "State", tag = "3")]
     pub state: i32,
     #[doc = " counterparty chain associated with this connection."]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub counterparty: ::core::option::Option<Counterparty>,
     #[doc = " delay period that must pass before a consensus state can be used for"]
     #[doc = " packet-verification NOTE: delay period logic is only implemented by some"]
@@ -55,20 +47,12 @@ pub struct IdentifiedConnection {
     #[doc = " IBC version which can be utilised to determine encodings or protocols for"]
     #[doc = " channels or packets utilising this connection"]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub versions: ::prost::alloc::vec::Vec<Version>,
     #[doc = " current state of the connection end."]
     #[prost(enumeration = "State", tag = "4")]
     pub state: i32,
     #[doc = " counterparty chain associated with this connection."]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub counterparty: ::core::option::Option<Counterparty>,
     #[doc = " delay period associated with this connection."]
     #[prost(uint64, tag = "6")]
@@ -96,10 +80,6 @@ pub struct Counterparty {
     pub connection_id: ::prost::alloc::string::String,
     #[doc = " commitment merkle prefix of the counterparty chain."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub prefix: ::core::option::Option<super::super::commitment::v1::MerklePrefix>,
 }
 impl ::prost::Name for Counterparty {
@@ -239,25 +219,13 @@ impl State {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GenesisState {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub connections: ::prost::alloc::vec::Vec<IdentifiedConnection>,
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub client_connection_paths: ::prost::alloc::vec::Vec<ConnectionPaths>,
     #[doc = " the sequence for the next generated connection identifier"]
     #[prost(uint64, tag = "3")]
     pub next_connection_sequence: u64,
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for GenesisState {
@@ -293,20 +261,12 @@ impl ::prost::Name for QueryConnectionRequest {
 pub struct QueryConnectionResponse {
     #[doc = " connection associated with the request identifier"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub connection: ::core::option::Option<ConnectionEnd>,
     #[doc = " merkle proof of existence"]
     #[prost(bytes = "vec", tag = "2")]
     pub proof: ::prost::alloc::vec::Vec<u8>,
     #[doc = " height at which the proof was retrieved"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryConnectionResponse {
@@ -323,10 +283,6 @@ impl ::prost::Name for QueryConnectionResponse {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryConnectionsRequest {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageRequest,
     >,
@@ -346,26 +302,14 @@ impl ::prost::Name for QueryConnectionsRequest {
 pub struct QueryConnectionsResponse {
     #[doc = " list of stored connections of the chain."]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub connections: ::prost::alloc::vec::Vec<IdentifiedConnection>,
     #[doc = " pagination response"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub pagination: ::core::option::Option<
         super::super::super::super::cosmos::base::query::v1beta1::PageResponse,
     >,
     #[doc = " query block height"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryConnectionsResponse {
@@ -406,10 +350,6 @@ pub struct QueryClientConnectionsResponse {
     pub proof: ::prost::alloc::vec::Vec<u8>,
     #[doc = " height at which the proof was generated"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
 impl ::prost::Name for QueryClientConnectionsResponse {
@@ -442,22 +382,10 @@ impl ::prost::Name for QueryConnectionClientStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryConnectionClientStateResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " client state associated with the channel"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub identified_client_state:
         ::core::option::Option<super::super::client::v1::IdentifiedClientState<A>>,
     #[doc = " merkle proof of existence"]
@@ -465,23 +393,10 @@ pub struct QueryConnectionClientStateResponse<
     pub proof: ::prost::alloc::vec::Vec<u8>,
     #[doc = " height at which the proof was retrieved"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryConnectionClientStateResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryConnectionClientStateResponse<A>
 {
     const NAME: &'static str = "QueryConnectionClientStateResponse";
     const PACKAGE: &'static str = "ibc.core.connection.v1";
@@ -516,23 +431,11 @@ impl ::prost::Name for QueryConnectionConsensusStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryConnectionConsensusStateResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " consensus state associated with the channel"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub consensus_state: ::core::option::Option<A>,
+    pub consensus_state: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " client ID associated with the consensus state"]
     #[prost(string, tag = "2")]
     pub client_id: ::prost::alloc::string::String,
@@ -541,23 +444,10 @@ pub struct QueryConnectionConsensusStateResponse<
     pub proof: ::prost::alloc::vec::Vec<u8>,
     #[doc = " height at which the proof was retrieved"]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryConnectionConsensusStateResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryConnectionConsensusStateResponse<A>
 {
     const NAME: &'static str = "QueryConnectionConsensusStateResponse";
     const PACKAGE: &'static str = "ibc.core.connection.v1";
@@ -584,10 +474,6 @@ impl ::prost::Name for QueryConnectionParamsRequest {
 pub struct QueryConnectionParamsResponse {
     #[doc = " params defines the parameters of the module."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for QueryConnectionParamsResponse {
@@ -606,16 +492,8 @@ pub struct MsgConnectionOpenInit {
     #[prost(string, tag = "1")]
     pub client_id: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub counterparty: ::core::option::Option<Counterparty>,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub version: ::core::option::Option<Version>,
     #[prost(uint64, tag = "4")]
     pub delay_period: u64,
@@ -648,15 +526,7 @@ impl ::prost::Name for MsgConnectionOpenInitResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgConnectionOpenTry<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(string, tag = "1")]
     pub client_id: ::prost::alloc::string::String,
@@ -665,30 +535,14 @@ pub struct MsgConnectionOpenTry<
     #[prost(string, tag = "2")]
     pub previous_connection_id: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub client_state: ::core::option::Option<A>,
+    pub client_state: ::core::option::Option<crate::any::Any<A>>,
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub counterparty: ::core::option::Option<Counterparty>,
     #[prost(uint64, tag = "5")]
     pub delay_period: u64,
     #[prost(message, repeated, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub counterparty_versions: ::prost::alloc::vec::Vec<Version>,
     #[prost(message, optional, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
     #[doc = " proof of the initialization the connection on Chain A: `UNITIALIZED ->"]
     #[doc = " INIT`"]
@@ -701,10 +555,6 @@ pub struct MsgConnectionOpenTry<
     #[prost(bytes = "vec", tag = "10")]
     pub proof_consensus: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "11")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub consensus_height: ::core::option::Option<super::super::client::v1::Height>,
     #[prost(string, tag = "12")]
     pub signer: ::prost::alloc::string::String,
@@ -712,17 +562,8 @@ pub struct MsgConnectionOpenTry<
     #[prost(bytes = "vec", tag = "13")]
     pub host_consensus_state_proof: ::prost::alloc::vec::Vec<u8>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgConnectionOpenTry<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgConnectionOpenTry<A>
 {
     const NAME: &'static str = "MsgConnectionOpenTry";
     const PACKAGE: &'static str = "ibc.core.connection.v1";
@@ -748,37 +589,17 @@ impl ::prost::Name for MsgConnectionOpenTryResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgConnectionOpenAck<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(string, tag = "1")]
     pub connection_id: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
     pub counterparty_connection_id: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub version: ::core::option::Option<Version>,
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub client_state: ::core::option::Option<A>,
+    pub client_state: ::core::option::Option<crate::any::Any<A>>,
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
     #[doc = " proof of the initialization the connection on Chain B: `UNITIALIZED ->"]
     #[doc = " TRYOPEN`"]
@@ -791,10 +612,6 @@ pub struct MsgConnectionOpenAck<
     #[prost(bytes = "vec", tag = "8")]
     pub proof_consensus: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "9")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub consensus_height: ::core::option::Option<super::super::client::v1::Height>,
     #[prost(string, tag = "10")]
     pub signer: ::prost::alloc::string::String,
@@ -802,17 +619,8 @@ pub struct MsgConnectionOpenAck<
     #[prost(bytes = "vec", tag = "11")]
     pub host_consensus_state_proof: ::prost::alloc::vec::Vec<u8>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgConnectionOpenAck<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgConnectionOpenAck<A>
 {
     const NAME: &'static str = "MsgConnectionOpenAck";
     const PACKAGE: &'static str = "ibc.core.connection.v1";
@@ -844,10 +652,6 @@ pub struct MsgConnectionOpenConfirm {
     #[prost(bytes = "vec", tag = "2")]
     pub proof_ack: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
     #[prost(string, tag = "4")]
     pub signer: ::prost::alloc::string::String,
diff --git a/packages/proto/src/gen/ibc.core.types.v1.abstract.rs b/packages/proto/src/gen/ibc.core.types.v1.abstract.rs
index fae1188..9dcbaee 100644
--- a/packages/proto/src/gen/ibc.core.types.v1.abstract.rs
+++ b/packages/proto/src/gen/ibc.core.types.v1.abstract.rs
@@ -3,31 +3,11 @@
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " ICS002 - Clients genesis state"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub client_genesis: ::core::option::Option<super::super::client::v1::GenesisState<A, BB>>,
     #[doc = " ICS003 - Connections genesis state"]
     #[prost(message, optional, tag = "2")]
@@ -37,24 +17,8 @@ pub struct GenesisState<
     pub channel_genesis: ::core::option::Option<super::super::channel::v1::GenesisState>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for GenesisState<A, BB>
 {
     const NAME: &'static str = "GenesisState";
diff --git a/packages/proto/src/gen/ibc.lightclients.solomachine.v2.abstract.rs b/packages/proto/src/gen/ibc.lightclients.solomachine.v2.abstract.rs
index 5a87b60..20ecb16 100644
--- a/packages/proto/src/gen/ibc.lightclients.solomachine.v2.abstract.rs
+++ b/packages/proto/src/gen/ibc.lightclients.solomachine.v2.abstract.rs
@@ -3,17 +3,8 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ClientState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct ClientState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[doc = " latest sequence of the client state"]
     #[prost(uint64, tag = "1")]
     pub sequence: u64,
@@ -21,27 +12,14 @@ pub struct ClientState<
     #[prost(bool, tag = "2")]
     pub is_frozen: bool,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub consensus_state: ::core::option::Option<ConsensusState<A>>,
     #[doc = " when set to true, will allow governance to update a solo machine client."]
     #[doc = " The client will be unfrozen if it is frozen."]
     #[prost(bool, tag = "4")]
     pub allow_update_after_proposal: bool,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ClientState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ClientState<A>
 {
     const NAME: &'static str = "ClientState";
     const PACKAGE: &'static str = "ibc.lightclients.solomachine.v2";
@@ -56,23 +34,11 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ConsensusState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " public key of the solo machine"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub public_key: ::core::option::Option<A>,
+    pub public_key: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " diversifier allows the same public key to be re-used across different solo"]
     #[doc = " machine clients (potentially on different chains) without being considered"]
     #[doc = " misbehaviour."]
@@ -81,17 +47,8 @@ pub struct ConsensusState<
     #[prost(uint64, tag = "3")]
     pub timestamp: u64,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ConsensusState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ConsensusState<A>
 {
     const NAME: &'static str = "ConsensusState";
     const PACKAGE: &'static str = "ibc.lightclients.solomachine.v2";
@@ -103,17 +60,7 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Header<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Header<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " sequence to update solo machine public key at"]
     #[prost(uint64, tag = "1")]
     pub sequence: u64,
@@ -122,25 +69,12 @@ pub struct Header<
     #[prost(bytes = "vec", tag = "3")]
     pub signature: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub new_public_key: ::core::option::Option<A>,
+    pub new_public_key: ::core::option::Option<crate::any::Any<A>>,
     #[prost(string, tag = "5")]
     pub new_diversifier: ::prost::alloc::string::String,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Header<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Header<A>
 {
     const NAME: &'static str = "Header";
     const PACKAGE: &'static str = "ibc.lightclients.solomachine.v2";
@@ -159,16 +93,8 @@ pub struct Misbehaviour {
     #[prost(uint64, tag = "2")]
     pub sequence: u64,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub signature_one: ::core::option::Option<SignatureAndData>,
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub signature_two: ::core::option::Option<SignatureAndData>,
 }
 impl ::prost::Name for Misbehaviour {
@@ -247,39 +173,16 @@ impl ::prost::Name for SignBytes {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct HeaderData<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct HeaderData<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " header public key"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub new_pub_key: ::core::option::Option<A>,
+    pub new_pub_key: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " header diversifier"]
     #[prost(string, tag = "2")]
     pub new_diversifier: ::prost::alloc::string::String,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for HeaderData<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for HeaderData<A>
 {
     const NAME: &'static str = "HeaderData";
     const PACKAGE: &'static str = "ibc.lightclients.solomachine.v2";
@@ -292,36 +195,15 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ClientStateData<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(bytes = "vec", tag = "1")]
     pub path: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub client_state: ::core::option::Option<A>,
+    pub client_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ClientStateData<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ClientStateData<A>
 {
     const NAME: &'static str = "ClientStateData";
     const PACKAGE: &'static str = "ibc.lightclients.solomachine.v2";
@@ -335,36 +217,15 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ConsensusStateData<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[prost(bytes = "vec", tag = "1")]
     pub path: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub consensus_state: ::core::option::Option<A>,
+    pub consensus_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ConsensusStateData<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ConsensusStateData<A>
 {
     const NAME: &'static str = "ConsensusStateData";
     const PACKAGE: &'static str = "ibc.lightclients.solomachine.v2";
@@ -381,10 +242,6 @@ pub struct ConnectionStateData {
     #[prost(bytes = "vec", tag = "1")]
     pub path: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub connection:
         ::core::option::Option<super::super::super::core::connection::v1::ConnectionEnd>,
 }
@@ -404,10 +261,6 @@ pub struct ChannelStateData {
     #[prost(bytes = "vec", tag = "1")]
     pub path: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub channel: ::core::option::Option<super::super::super::core::channel::v1::Channel>,
 }
 impl ::prost::Name for ChannelStateData {
diff --git a/packages/proto/src/gen/ibc.lightclients.solomachine.v3.abstract.rs b/packages/proto/src/gen/ibc.lightclients.solomachine.v3.abstract.rs
index 101572b..63504e2 100644
--- a/packages/proto/src/gen/ibc.lightclients.solomachine.v3.abstract.rs
+++ b/packages/proto/src/gen/ibc.lightclients.solomachine.v3.abstract.rs
@@ -3,17 +3,8 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ClientState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct ClientState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[doc = " latest sequence of the client state"]
     #[prost(uint64, tag = "1")]
     pub sequence: u64,
@@ -21,23 +12,10 @@ pub struct ClientState<
     #[prost(bool, tag = "2")]
     pub is_frozen: bool,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub consensus_state: ::core::option::Option<ConsensusState<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ClientState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ClientState<A>
 {
     const NAME: &'static str = "ClientState";
     const PACKAGE: &'static str = "ibc.lightclients.solomachine.v3";
@@ -52,23 +30,11 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ConsensusState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " public key of the solo machine"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub public_key: ::core::option::Option<A>,
+    pub public_key: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " diversifier allows the same public key to be re-used across different solo"]
     #[doc = " machine clients (potentially on different chains) without being considered"]
     #[doc = " misbehaviour."]
@@ -77,17 +43,8 @@ pub struct ConsensusState<
     #[prost(uint64, tag = "3")]
     pub timestamp: u64,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ConsensusState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ConsensusState<A>
 {
     const NAME: &'static str = "ConsensusState";
     const PACKAGE: &'static str = "ibc.lightclients.solomachine.v3";
@@ -99,41 +56,18 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Header<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Header<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[prost(uint64, tag = "1")]
     pub timestamp: u64,
     #[prost(bytes = "vec", tag = "2")]
     pub signature: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub new_public_key: ::core::option::Option<A>,
+    pub new_public_key: ::core::option::Option<crate::any::Any<A>>,
     #[prost(string, tag = "4")]
     pub new_diversifier: ::prost::alloc::string::String,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Header<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Header<A>
 {
     const NAME: &'static str = "Header";
     const PACKAGE: &'static str = "ibc.lightclients.solomachine.v3";
@@ -150,16 +84,8 @@ pub struct Misbehaviour {
     #[prost(uint64, tag = "1")]
     pub sequence: u64,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub signature_one: ::core::option::Option<SignatureAndData>,
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub signature_two: ::core::option::Option<SignatureAndData>,
 }
 impl ::prost::Name for Misbehaviour {
@@ -241,39 +167,16 @@ impl ::prost::Name for SignBytes {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct HeaderData<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct HeaderData<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " header public key"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub new_pub_key: ::core::option::Option<A>,
+    pub new_pub_key: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " header diversifier"]
     #[prost(string, tag = "2")]
     pub new_diversifier: ::prost::alloc::string::String,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for HeaderData<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for HeaderData<A>
 {
     const NAME: &'static str = "HeaderData";
     const PACKAGE: &'static str = "ibc.lightclients.solomachine.v3";

From 04287ad04927b2c2aa2524ff5eef55dd9ee08cdc Mon Sep 17 00:00:00 2001
From: Guy Garcia <guy.garcia@protonmail.com>
Date: Mon, 14 Oct 2024 12:30:15 -0400
Subject: [PATCH 3/7] ignoring new clippy warnings

---
 packages/bindings/src/lib.rs | 7 ++++++-
 packages/proto/src/lib.rs    | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/bindings/src/lib.rs b/packages/bindings/src/lib.rs
index 57d74b6..f8fba0d 100644
--- a/packages/bindings/src/lib.rs
+++ b/packages/bindings/src/lib.rs
@@ -2,7 +2,12 @@
 #![doc = include_str!("../README.md")]
 #![doc(html_logo_url = "https://avatars.githubusercontent.com/u/86496504?s=100")]
 #![cfg_attr(docsrs, feature(doc_cfg))]
-#![allow(rustdoc::bare_urls, clippy::derive_partial_eq_without_eq)]
+#![allow(
+    rustdoc::bare_urls,
+    clippy::derive_partial_eq_without_eq,
+    clippy::doc_lazy_continuation,
+    clippy::too_long_first_doc_paragraph
+)]
 #![forbid(unsafe_code)]
 #![warn(trivial_casts, trivial_numeric_casts, unused_import_braces)]
 
diff --git a/packages/proto/src/lib.rs b/packages/proto/src/lib.rs
index 423f9de..f7eeb89 100644
--- a/packages/proto/src/lib.rs
+++ b/packages/proto/src/lib.rs
@@ -1,7 +1,12 @@
 #![doc = include_str!("../README.md")]
 #![doc(html_logo_url = "https://avatars.githubusercontent.com/u/86496504?s=100")]
 #![cfg_attr(docsrs, feature(doc_cfg))]
-#![allow(rustdoc::bare_urls, clippy::derive_partial_eq_without_eq)]
+#![allow(
+    rustdoc::bare_urls,
+    clippy::derive_partial_eq_without_eq,
+    clippy::doc_lazy_continuation,
+    clippy::too_long_first_doc_paragraph
+)]
 #![forbid(unsafe_code)]
 #![warn(trivial_casts, trivial_numeric_casts, unused_import_braces)]
 

From 87d3810bf76fb50416c829a09f1b69a02e490e7c Mon Sep 17 00:00:00 2001
From: Guy Garcia <guy.garcia@protonmail.com>
Date: Mon, 14 Oct 2024 23:26:28 -0400
Subject: [PATCH 4/7] Improved support to remove GenericData dependency and use
 `Vec<u8>` instead

---
 packages/proto/src/any.rs                     | 106 ++---------
 .../src/gen/archway.cwica.v1.abstract.rs      |   6 +-
 .../src/gen/archway.genmsg.v1.abstract.rs     |   5 +-
 .../src/gen/cosmos.app.v1alpha1.abstract.rs   |  17 +-
 .../src/gen/cosmos.auth.v1beta1.abstract.rs   |  42 ++---
 .../src/gen/cosmos.authz.v1beta1.abstract.rs  |  49 ++----
 .../gen/cosmos.base.abci.v1beta1.abstract.rs  |  28 ++-
 ...cosmos.base.tendermint.v1beta1.abstract.rs |  14 +-
 .../gen/cosmos.crypto.keyring.v1.abstract.rs  |   6 +-
 .../gen/cosmos.crypto.multisig.abstract.rs    |   6 +-
 .../gen/cosmos.evidence.v1beta1.abstract.rs   |  23 +--
 .../gen/cosmos.feegrant.v1beta1.abstract.rs   |  39 ++--
 .../proto/src/gen/cosmos.gov.v1.abstract.rs   |  35 ++--
 .../src/gen/cosmos.gov.v1beta1.abstract.rs    |  29 ++-
 .../proto/src/gen/cosmos.group.v1.abstract.rs |  64 +++----
 .../src/gen/cosmos.nft.v1beta1.abstract.rs    |  50 ++----
 .../gen/cosmos.orm.query.v1alpha1.abstract.rs |  10 +-
 .../gen/cosmos.staking.v1beta1.abstract.rs    |  47 ++---
 .../gen/cosmos.tx.signing.v1beta1.abstract.rs |  12 +-
 .../src/gen/cosmos.tx.v1beta1.abstract.rs     | 166 ++++++++----------
 .../gen/cosmos.upgrade.v1beta1.abstract.rs    |  24 +--
 .../gen/cosmos.vesting.v1beta1.abstract.rs    |  30 ++--
 .../src/gen/cosmwasm.wasm.v1.abstract.rs      |  47 +++--
 ...cations.interchain_accounts.v1.abstract.rs |  12 +-
 .../src/gen/ibc.core.channel.v1.abstract.rs   |   8 +-
 .../src/gen/ibc.core.client.v1.abstract.rs    |  91 ++++------
 .../gen/ibc.core.connection.v1.abstract.rs    |  20 +--
 .../src/gen/ibc.core.types.v1.abstract.rs     |   8 +-
 ...bc.lightclients.solomachine.v2.abstract.rs |  33 ++--
 ...bc.lightclients.solomachine.v3.abstract.rs |  21 +--
 packages/proto/src/lib.rs                     |   1 +
 proto-build/src/parser.rs                     |  20 +--
 32 files changed, 397 insertions(+), 672 deletions(-)

diff --git a/packages/proto/src/any.rs b/packages/proto/src/any.rs
index de478cd..ca2f736 100644
--- a/packages/proto/src/any.rs
+++ b/packages/proto/src/any.rs
@@ -2,56 +2,7 @@ use prost::bytes::{Buf, BufMut};
 use prost::{Message, Name};
 use serde::{ser, Deserialize, Deserializer, Serialize, Serializer};
 
-/// Works as a wrapper for Vec<u8> when working with structures that have an undefined/unknown type.
-#[derive(:: serde :: Serialize, :: serde :: Deserialize, Clone, PartialEq, Debug, Default)]
-pub struct GenericData(pub Vec<u8>);
-
-impl Message for GenericData {
-    fn encode_raw<B>(&self, buf: &mut B)
-    where
-        B: BufMut,
-    {
-        buf.put_slice(self.0.as_slice());
-    }
-
-    fn merge_field<B>(
-        &mut self,
-        tag: u32,
-        _wire_type: prost::encoding::WireType,
-        buf: &mut B,
-        _ctx: prost::encoding::DecodeContext,
-    ) -> Result<(), prost::DecodeError>
-    where
-        B: Buf,
-    {
-        if tag == 1 {
-            self.0.push(10u8);
-            while buf.has_remaining() {
-                self.0.push(buf.get_u8());
-            }
-            Ok(())
-        } else {
-            Err(prost::DecodeError::new("invalid tag"))
-        }
-    }
-
-    fn encoded_len(&self) -> usize {
-        self.0.len()
-    }
-
-    fn clear(&mut self) {
-        self.0.clear();
-    }
-}
-
-impl Name for GenericData {
-    const NAME: &'static str = "";
-    const PACKAGE: &'static str = "";
-
-    fn full_name() -> String {
-        format!("{}{}", Self::PACKAGE, Self::NAME)
-    }
-}
+pub type GenericData = Vec<u8>;
 
 // An improved any type that allows you to implement typing directly into it
 #[derive(Clone, PartialEq, Serialize, Deserialize, Message)]
@@ -73,7 +24,7 @@ impl<T: Message + Name + PartialEq + Default> Any<T> {
     pub fn generic(value: T) -> Any<GenericData> {
         Any {
             type_url: T::full_name(),
-            value: GenericData(value.encode_to_vec()),
+            value: value.encode_to_vec(),
         }
     }
 }
@@ -211,9 +162,9 @@ mod test {
     use serde::{Deserialize, Serialize};
     use serde_test::{assert_tokens, Token};
 
-    #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
+    #[derive(::serde::Serialize, ::serde::Deserialize)]
     #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, :: prost :: Message)]
+    #[derive(Clone, PartialEq, ::prost::Message)]
     struct ExternalStructTest<
         A: Default + Message + Name + Send + Sync + Serialize + DeserializeOwned + PartialEq + Clone,
     > {
@@ -226,16 +177,16 @@ mod test {
     }
 
     impl<
-            A: Default
-                + Message
-                + Name
-                + Send
-                + Sync
-                + Serialize
-                + DeserializeOwned
-                + PartialEq
-                + Clone,
-        > Name for ExternalStructTest<A>
+        A: Default
+        + Message
+        + Name
+        + Send
+        + Sync
+        + Serialize
+        + DeserializeOwned
+        + PartialEq
+        + Clone,
+    > Name for ExternalStructTest<A>
     {
         const NAME: &'static str = "AnyValue";
         const PACKAGE: &'static str = "test";
@@ -245,9 +196,9 @@ mod test {
         }
     }
 
-    #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
+    #[derive(::serde::Serialize, ::serde::Deserialize)]
     #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, :: prost :: Message)]
+    #[derive(Clone, PartialEq, ::prost::Message)]
     struct BuildTest<
         A: Default + Message + Name + Send + Sync + Serialize + DeserializeOwned + PartialEq + Clone,
         C: Default + Message + Name + Send + Sync + Serialize + DeserializeOwned + PartialEq + Clone,
@@ -299,31 +250,6 @@ mod test {
         }
     }
 
-    #[test]
-    fn generic_equal_any() {
-        let val = AnyValue {
-            value: "testinnnng".to_string(),
-            number: 33,
-        };
-
-        dbg!(val.encode_to_vec());
-        dbg!(GenericData(val.encode_to_vec()).encode_to_vec());
-
-        let real_any = Any::new(val.clone());
-        let bytes_any = Any::generic(val);
-
-        let mut real_encoded = real_any.encode_to_vec();
-        let mut bytes_encoded = bytes_any.encode_to_vec();
-
-        assert_eq!(real_encoded, bytes_encoded);
-
-        let real_decoded = Any::<AnyValue>::decode(bytes_encoded.as_slice()).unwrap();
-        let bytes_decoded = Any::<GenericData>::decode(real_encoded.as_slice()).unwrap();
-
-        assert_eq!(real_decoded.type_url, bytes_decoded.type_url);
-        assert_eq!(real_decoded.value.encode_to_vec(), bytes_decoded.value.0);
-    }
-
     #[test]
     fn test_ser_de() {
         let test = Test {
diff --git a/packages/proto/src/gen/archway.cwica.v1.abstract.rs b/packages/proto/src/gen/archway.cwica.v1.abstract.rs
index 9766af1..4ae1dda 100644
--- a/packages/proto/src/gen/archway.cwica.v1.abstract.rs
+++ b/packages/proto/src/gen/archway.cwica.v1.abstract.rs
@@ -216,7 +216,7 @@ impl ::prost::Name for MsgRegisterInterchainAccountResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgSendTx<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct MsgSendTx<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " contract_address is the address of the who wants to submit a transaction to"]
     #[doc = " the counterparty chain"]
     #[prost(string, tag = "1")]
@@ -234,9 +234,7 @@ pub struct MsgSendTx<A: Clone + PartialEq + Default + Send + Sync + prost::Messa
     #[prost(uint64, tag = "5")]
     pub timeout: u64,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for MsgSendTx<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for MsgSendTx<A> {
     const NAME: &'static str = "MsgSendTx";
     const PACKAGE: &'static str = "archway.cwica.v1";
     fn full_name() -> ::prost::alloc::string::String {
diff --git a/packages/proto/src/gen/archway.genmsg.v1.abstract.rs b/packages/proto/src/gen/archway.genmsg.v1.abstract.rs
index df33063..ddfa13f 100644
--- a/packages/proto/src/gen/archway.genmsg.v1.abstract.rs
+++ b/packages/proto/src/gen/archway.genmsg.v1.abstract.rs
@@ -2,12 +2,11 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, repeated, tag = "1")]
     pub messages: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
diff --git a/packages/proto/src/gen/cosmos.app.v1alpha1.abstract.rs b/packages/proto/src/gen/cosmos.app.v1alpha1.abstract.rs
index abfcef5..409d890 100644
--- a/packages/proto/src/gen/cosmos.app.v1alpha1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.app.v1alpha1.abstract.rs
@@ -112,7 +112,7 @@ impl ::prost::Name for MigrateFromInfo {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Config<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Config<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " modules are the module configurations for the app."]
     #[prost(message, repeated, tag = "1")]
     pub modules: ::prost::alloc::vec::Vec<ModuleConfig<A>>,
@@ -122,9 +122,7 @@ pub struct Config<A: Clone + PartialEq + Default + Send + Sync + prost::Message
     #[prost(message, repeated, tag = "2")]
     pub golang_bindings: ::prost::alloc::vec::Vec<GolangBinding>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Config<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Config<A> {
     const NAME: &'static str = "Config";
     const PACKAGE: &'static str = "cosmos.app.v1alpha1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -135,8 +133,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ModuleConfig<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct ModuleConfig<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " name is the unique name of the module within the app. It should be a name"]
     #[doc = " that persists between different versions of a module so that modules"]
     #[doc = " can be smoothly upgraded to new versions."]
@@ -159,7 +156,7 @@ pub struct ModuleConfig<A: Clone + PartialEq + Default + Send + Sync + prost::Me
     #[prost(message, repeated, tag = "3")]
     pub golang_bindings: ::prost::alloc::vec::Vec<GolangBinding>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for ModuleConfig<A>
 {
     const NAME: &'static str = "ModuleConfig";
@@ -203,14 +200,12 @@ impl ::prost::Name for QueryConfigRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryConfigResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryConfigResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " config is the current app config."]
     #[prost(message, optional, tag = "1")]
     pub config: ::core::option::Option<Config<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryConfigResponse<A>
 {
     const NAME: &'static str = "QueryConfigResponse";
diff --git a/packages/proto/src/gen/cosmos.auth.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.auth.v1beta1.abstract.rs
index e0a6743..e2aaa3b 100644
--- a/packages/proto/src/gen/cosmos.auth.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.auth.v1beta1.abstract.rs
@@ -4,8 +4,7 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct BaseAccount<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct BaseAccount<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(string, tag = "1")]
     pub address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
@@ -15,7 +14,7 @@ pub struct BaseAccount<A: Clone + PartialEq + Default + Send + Sync + prost::Mes
     #[prost(uint64, tag = "4")]
     pub sequence: u64,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for BaseAccount<A>
 {
     const NAME: &'static str = "BaseAccount";
@@ -28,9 +27,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ModuleAccount<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct ModuleAccount<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, optional, tag = "1")]
     pub base_account: ::core::option::Option<BaseAccount<A>>,
     #[prost(string, tag = "2")]
@@ -38,7 +35,7 @@ pub struct ModuleAccount<
     #[prost(string, repeated, tag = "3")]
     pub permissions: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for ModuleAccount<A>
 {
     const NAME: &'static str = "ModuleAccount";
@@ -96,8 +93,7 @@ impl ::prost::Name for Params {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " params defines all the parameters of the module."]
     #[prost(message, optional, tag = "1")]
     pub params: ::core::option::Option<Params>,
@@ -105,7 +101,7 @@ pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Me
     #[prost(message, repeated, tag = "2")]
     pub accounts: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
@@ -138,9 +134,7 @@ impl ::prost::Name for QueryAccountsRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryAccountsResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryAccountsResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " accounts are the existing accounts"]
     #[prost(message, repeated, tag = "1")]
     pub accounts: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
@@ -148,7 +142,7 @@ pub struct QueryAccountsResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryAccountsResponse<A>
 {
     const NAME: &'static str = "QueryAccountsResponse";
@@ -177,14 +171,12 @@ impl ::prost::Name for QueryAccountRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryAccountResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryAccountResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " account defines the account of the corresponding address."]
     #[prost(message, optional, tag = "1")]
     pub account: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryAccountResponse<A>
 {
     const NAME: &'static str = "QueryAccountResponse";
@@ -242,12 +234,12 @@ impl ::prost::Name for QueryModuleAccountsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryModuleAccountsResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[prost(message, repeated, tag = "1")]
     pub accounts: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryModuleAccountsResponse<A>
 {
     const NAME: &'static str = "QueryModuleAccountsResponse";
@@ -276,12 +268,12 @@ impl ::prost::Name for QueryModuleAccountByNameRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryModuleAccountByNameResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[prost(message, optional, tag = "1")]
     pub account: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryModuleAccountByNameResponse<A>
 {
     const NAME: &'static str = "QueryModuleAccountByNameResponse";
@@ -458,14 +450,12 @@ impl ::prost::Name for QueryAccountInfoRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryAccountInfoResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryAccountInfoResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " info is the account info which is represented by BaseAccount."]
     #[prost(message, optional, tag = "1")]
     pub info: ::core::option::Option<BaseAccount<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryAccountInfoResponse<A>
 {
     const NAME: &'static str = "QueryAccountInfoResponse";
diff --git a/packages/proto/src/gen/cosmos.authz.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.authz.v1beta1.abstract.rs
index 181f948..c56c584 100644
--- a/packages/proto/src/gen/cosmos.authz.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.authz.v1beta1.abstract.rs
@@ -20,7 +20,7 @@ impl ::prost::Name for GenericAuthorization {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Grant<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Grant<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, optional, tag = "1")]
     pub authorization: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " time when the grant will expire and will be pruned. If null, then the grant"]
@@ -29,9 +29,7 @@ pub struct Grant<A: Clone + PartialEq + Default + Send + Sync + prost::Message +
     #[prost(message, optional, tag = "2")]
     pub expiration: ::core::option::Option<::pbjson_types::Timestamp>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Grant<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Grant<A> {
     const NAME: &'static str = "Grant";
     const PACKAGE: &'static str = "cosmos.authz.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -43,9 +41,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GrantAuthorization<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct GrantAuthorization<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(string, tag = "1")]
     pub granter: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
@@ -55,7 +51,7 @@ pub struct GrantAuthorization<
     #[prost(message, optional, tag = "4")]
     pub expiration: ::core::option::Option<::pbjson_types::Timestamp>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GrantAuthorization<A>
 {
     const NAME: &'static str = "GrantAuthorization";
@@ -128,12 +124,11 @@ impl ::prost::Name for EventRevoke {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, repeated, tag = "1")]
     pub authorization: ::prost::alloc::vec::Vec<GrantAuthorization<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
@@ -169,9 +164,7 @@ impl ::prost::Name for QueryGrantsRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryGrantsResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryGrantsResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " authorizations is a list of grants granted for grantee by granter."]
     #[prost(message, repeated, tag = "1")]
     pub grants: ::prost::alloc::vec::Vec<Grant<A>>,
@@ -179,7 +172,7 @@ pub struct QueryGrantsResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryGrantsResponse<A>
 {
     const NAME: &'static str = "QueryGrantsResponse";
@@ -210,9 +203,8 @@ impl ::prost::Name for QueryGranterGrantsRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryGranterGrantsResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryGranterGrantsResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message>
+{
     #[doc = " grants is a list of grants granted by the granter."]
     #[prost(message, repeated, tag = "1")]
     pub grants: ::prost::alloc::vec::Vec<GrantAuthorization<A>>,
@@ -220,7 +212,7 @@ pub struct QueryGranterGrantsResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryGranterGrantsResponse<A>
 {
     const NAME: &'static str = "QueryGranterGrantsResponse";
@@ -251,9 +243,8 @@ impl ::prost::Name for QueryGranteeGrantsRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryGranteeGrantsResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryGranteeGrantsResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message>
+{
     #[doc = " grants is a list of grants granted to the grantee."]
     #[prost(message, repeated, tag = "1")]
     pub grants: ::prost::alloc::vec::Vec<GrantAuthorization<A>>,
@@ -261,7 +252,7 @@ pub struct QueryGranteeGrantsResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryGranteeGrantsResponse<A>
 {
     const NAME: &'static str = "QueryGranteeGrantsResponse";
@@ -275,7 +266,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgGrant<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct MsgGrant<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(string, tag = "1")]
     pub granter: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
@@ -283,9 +274,7 @@ pub struct MsgGrant<A: Clone + PartialEq + Default + Send + Sync + prost::Messag
     #[prost(message, optional, tag = "3")]
     pub grant: ::core::option::Option<Grant<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for MsgGrant<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for MsgGrant<A> {
     const NAME: &'static str = "MsgGrant";
     const PACKAGE: &'static str = "cosmos.authz.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -313,7 +302,7 @@ impl ::prost::Name for MsgExecResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgExec<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct MsgExec<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(string, tag = "1")]
     pub grantee: ::prost::alloc::string::String,
     #[doc = " Execute Msg."]
@@ -322,9 +311,7 @@ pub struct MsgExec<A: Clone + PartialEq + Default + Send + Sync + prost::Message
     #[prost(message, repeated, tag = "2")]
     pub msgs: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for MsgExec<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for MsgExec<A> {
     const NAME: &'static str = "MsgExec";
     const PACKAGE: &'static str = "cosmos.authz.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
diff --git a/packages/proto/src/gen/cosmos.base.abci.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.base.abci.v1beta1.abstract.rs
index 1af5cda..8e989b5 100644
--- a/packages/proto/src/gen/cosmos.base.abci.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.base.abci.v1beta1.abstract.rs
@@ -3,7 +3,7 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct TxResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct TxResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " The block height"]
     #[prost(int64, tag = "1")]
     pub height: i64,
@@ -52,7 +52,7 @@ pub struct TxResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Mess
     #[prost(message, repeated, tag = "13")]
     pub events: ::prost::alloc::vec::Vec<::tendermint_proto::v0_37::abci::Event>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for TxResponse<A>
 {
     const NAME: &'static str = "TxResponse";
@@ -141,7 +141,7 @@ impl ::prost::Name for GasInfo {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Result<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Result<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " Data is any data returned from message or handler execution. It MUST be"]
     #[doc = " length prefixed in order to separate data from multiple message executions."]
     #[doc = " Deprecated. This field is still populated, but prefer msg_response instead"]
@@ -162,9 +162,7 @@ pub struct Result<A: Clone + PartialEq + Default + Send + Sync + prost::Message
     #[prost(message, repeated, tag = "4")]
     pub msg_responses: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Result<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Result<A> {
     const NAME: &'static str = "Result";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -176,15 +174,13 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct SimulationResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct SimulationResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, optional, tag = "1")]
     pub gas_info: ::core::option::Option<GasInfo>,
     #[prost(message, optional, tag = "2")]
     pub result: ::core::option::Option<Result<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for SimulationResponse<A>
 {
     const NAME: &'static str = "SimulationResponse";
@@ -216,7 +212,7 @@ impl ::prost::Name for MsgData {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct TxMsgData<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct TxMsgData<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " data field is deprecated and not populated."]
     #[deprecated]
     #[prost(message, repeated, tag = "1")]
@@ -227,9 +223,7 @@ pub struct TxMsgData<A: Clone + PartialEq + Default + Send + Sync + prost::Messa
     #[prost(message, repeated, tag = "2")]
     pub msg_responses: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for TxMsgData<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for TxMsgData<A> {
     const NAME: &'static str = "TxMsgData";
     const PACKAGE: &'static str = "cosmos.base.abci.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -240,9 +234,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct SearchTxsResult<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct SearchTxsResult<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " Count of all txs"]
     #[prost(uint64, tag = "1")]
     pub total_count: u64,
@@ -262,7 +254,7 @@ pub struct SearchTxsResult<
     #[prost(message, repeated, tag = "6")]
     pub txs: ::prost::alloc::vec::Vec<TxResponse<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for SearchTxsResult<A>
 {
     const NAME: &'static str = "SearchTxsResult";
diff --git a/packages/proto/src/gen/cosmos.base.tendermint.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.base.tendermint.v1beta1.abstract.rs
index 20230e9..705aa2f 100644
--- a/packages/proto/src/gen/cosmos.base.tendermint.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.base.tendermint.v1beta1.abstract.rs
@@ -105,7 +105,7 @@ impl ::prost::Name for GetValidatorSetByHeightRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GetValidatorSetByHeightResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[prost(int64, tag = "1")]
     pub block_height: i64,
@@ -115,7 +115,7 @@ pub struct GetValidatorSetByHeightResponse<
     #[prost(message, optional, tag = "3")]
     pub pagination: ::core::option::Option<super::super::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GetValidatorSetByHeightResponse<A>
 {
     const NAME: &'static str = "GetValidatorSetByHeightResponse";
@@ -145,7 +145,7 @@ impl ::prost::Name for GetLatestValidatorSetRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GetLatestValidatorSetResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[prost(int64, tag = "1")]
     pub block_height: i64,
@@ -155,7 +155,7 @@ pub struct GetLatestValidatorSetResponse<
     #[prost(message, optional, tag = "3")]
     pub pagination: ::core::option::Option<super::super::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GetLatestValidatorSetResponse<A>
 {
     const NAME: &'static str = "GetLatestValidatorSetResponse";
@@ -168,7 +168,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Validator<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Validator<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(string, tag = "1")]
     pub address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
@@ -178,9 +178,7 @@ pub struct Validator<A: Clone + PartialEq + Default + Send + Sync + prost::Messa
     #[prost(int64, tag = "4")]
     pub proposer_priority: i64,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Validator<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Validator<A> {
     const NAME: &'static str = "Validator";
     const PACKAGE: &'static str = "cosmos.base.tendermint.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
diff --git a/packages/proto/src/gen/cosmos.crypto.keyring.v1.abstract.rs b/packages/proto/src/gen/cosmos.crypto.keyring.v1.abstract.rs
index 201ac07..807fbcb 100644
--- a/packages/proto/src/gen/cosmos.crypto.keyring.v1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.crypto.keyring.v1.abstract.rs
@@ -2,7 +2,7 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Record<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Record<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " name represents a name of Record"]
     #[prost(string, tag = "1")]
     pub name: ::prost::alloc::string::String,
@@ -89,9 +89,7 @@ pub mod record {
         Offline(Offline),
     }
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Record<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Record<A> {
     const NAME: &'static str = "Record";
     const PACKAGE: &'static str = "cosmos.crypto.keyring.v1";
     fn full_name() -> ::prost::alloc::string::String {
diff --git a/packages/proto/src/gen/cosmos.crypto.multisig.abstract.rs b/packages/proto/src/gen/cosmos.crypto.multisig.abstract.rs
index 421deed..e4aa48e 100644
--- a/packages/proto/src/gen/cosmos.crypto.multisig.abstract.rs
+++ b/packages/proto/src/gen/cosmos.crypto.multisig.abstract.rs
@@ -4,15 +4,13 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct LegacyAminoPubKey<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct LegacyAminoPubKey<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(uint32, tag = "1")]
     pub threshold: u32,
     #[prost(message, repeated, tag = "2")]
     pub public_keys: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for LegacyAminoPubKey<A>
 {
     const NAME: &'static str = "LegacyAminoPubKey";
diff --git a/packages/proto/src/gen/cosmos.evidence.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.evidence.v1beta1.abstract.rs
index 0fbe715..e1a46a0 100644
--- a/packages/proto/src/gen/cosmos.evidence.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.evidence.v1beta1.abstract.rs
@@ -28,13 +28,12 @@ impl ::prost::Name for Equivocation {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " evidence defines all the evidence at genesis."]
     #[prost(message, repeated, tag = "1")]
     pub evidence: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
@@ -70,14 +69,12 @@ impl ::prost::Name for QueryEvidenceRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryEvidenceResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryEvidenceResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " evidence returns the requested evidence."]
     #[prost(message, optional, tag = "1")]
     pub evidence: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryEvidenceResponse<A>
 {
     const NAME: &'static str = "QueryEvidenceResponse";
@@ -108,9 +105,7 @@ impl ::prost::Name for QueryAllEvidenceRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryAllEvidenceResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryAllEvidenceResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " evidence returns all evidences."]
     #[prost(message, repeated, tag = "1")]
     pub evidence: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
@@ -118,7 +113,7 @@ pub struct QueryAllEvidenceResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryAllEvidenceResponse<A>
 {
     const NAME: &'static str = "QueryAllEvidenceResponse";
@@ -132,9 +127,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgSubmitEvidence<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgSubmitEvidence<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " submitter is the signer account address of evidence."]
     #[prost(string, tag = "1")]
     pub submitter: ::prost::alloc::string::String,
@@ -142,7 +135,7 @@ pub struct MsgSubmitEvidence<
     #[prost(message, optional, tag = "2")]
     pub evidence: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgSubmitEvidence<A>
 {
     const NAME: &'static str = "MsgSubmitEvidence";
diff --git a/packages/proto/src/gen/cosmos.feegrant.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.feegrant.v1beta1.abstract.rs
index 5c3782e..5b7dc37 100644
--- a/packages/proto/src/gen/cosmos.feegrant.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.feegrant.v1beta1.abstract.rs
@@ -57,9 +57,7 @@ impl ::prost::Name for PeriodicAllowance {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct AllowedMsgAllowance<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct AllowedMsgAllowance<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " allowance can be any of basic and periodic fee allowance."]
     #[prost(message, optional, tag = "1")]
     pub allowance: ::core::option::Option<crate::any::Any<A>>,
@@ -67,7 +65,7 @@ pub struct AllowedMsgAllowance<
     #[prost(string, repeated, tag = "2")]
     pub allowed_messages: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for AllowedMsgAllowance<A>
 {
     const NAME: &'static str = "AllowedMsgAllowance";
@@ -80,7 +78,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Grant<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Grant<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " granter is the address of the user granting an allowance of their funds."]
     #[prost(string, tag = "1")]
     pub granter: ::prost::alloc::string::String,
@@ -91,9 +89,7 @@ pub struct Grant<A: Clone + PartialEq + Default + Send + Sync + prost::Message +
     #[prost(message, optional, tag = "3")]
     pub allowance: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Grant<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Grant<A> {
     const NAME: &'static str = "Grant";
     const PACKAGE: &'static str = "cosmos.feegrant.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -104,12 +100,11 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, repeated, tag = "1")]
     pub allowances: ::prost::alloc::vec::Vec<Grant<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
@@ -141,14 +136,12 @@ impl ::prost::Name for QueryAllowanceRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryAllowanceResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryAllowanceResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " allowance is a allowance granted for grantee by granter."]
     #[prost(message, optional, tag = "1")]
     pub allowance: ::core::option::Option<Grant<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryAllowanceResponse<A>
 {
     const NAME: &'static str = "QueryAllowanceResponse";
@@ -179,9 +172,7 @@ impl ::prost::Name for QueryAllowancesRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryAllowancesResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryAllowancesResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " allowances are allowance's granted for grantee by granter."]
     #[prost(message, repeated, tag = "1")]
     pub allowances: ::prost::alloc::vec::Vec<Grant<A>>,
@@ -189,7 +180,7 @@ pub struct QueryAllowancesResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryAllowancesResponse<A>
 {
     const NAME: &'static str = "QueryAllowancesResponse";
@@ -225,7 +216,7 @@ impl ::prost::Name for QueryAllowancesByGranterRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryAllowancesByGranterResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " allowances that have been issued by the granter."]
     #[prost(message, repeated, tag = "1")]
@@ -234,7 +225,7 @@ pub struct QueryAllowancesByGranterResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryAllowancesByGranterResponse<A>
 {
     const NAME: &'static str = "QueryAllowancesByGranterResponse";
@@ -248,9 +239,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgGrantAllowance<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgGrantAllowance<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " granter is the address of the user granting an allowance of their funds."]
     #[prost(string, tag = "1")]
     pub granter: ::prost::alloc::string::String,
@@ -261,7 +250,7 @@ pub struct MsgGrantAllowance<
     #[prost(message, optional, tag = "3")]
     pub allowance: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgGrantAllowance<A>
 {
     const NAME: &'static str = "MsgGrantAllowance";
diff --git a/packages/proto/src/gen/cosmos.gov.v1.abstract.rs b/packages/proto/src/gen/cosmos.gov.v1.abstract.rs
index 5ae1005..afca0a7 100644
--- a/packages/proto/src/gen/cosmos.gov.v1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.gov.v1.abstract.rs
@@ -44,7 +44,7 @@ impl ::prost::Name for Deposit {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Proposal<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Proposal<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " id defines the unique id of the proposal."]
     #[prost(uint64, tag = "1")]
     pub id: u64,
@@ -93,9 +93,7 @@ pub struct Proposal<A: Clone + PartialEq + Default + Send + Sync + prost::Messag
     #[prost(string, tag = "13")]
     pub proposer: ::prost::alloc::string::String,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Proposal<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Proposal<A> {
     const NAME: &'static str = "Proposal";
     const PACKAGE: &'static str = "cosmos.gov.v1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -380,8 +378,7 @@ impl ProposalStatus {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " starting_proposal_id is the ID of the starting proposal."]
     #[prost(uint64, tag = "1")]
     pub starting_proposal_id: u64,
@@ -415,7 +412,7 @@ pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Me
     #[prost(message, optional, tag = "8")]
     pub params: ::core::option::Option<Params>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
@@ -444,14 +441,12 @@ impl ::prost::Name for QueryProposalRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryProposalResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryProposalResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " proposal is the requested governance proposal."]
     #[prost(message, optional, tag = "1")]
     pub proposal: ::core::option::Option<Proposal<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryProposalResponse<A>
 {
     const NAME: &'static str = "QueryProposalResponse";
@@ -490,9 +485,7 @@ impl ::prost::Name for QueryProposalsRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryProposalsResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryProposalsResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " proposals defines all the requested governance proposals."]
     #[prost(message, repeated, tag = "1")]
     pub proposals: ::prost::alloc::vec::Vec<Proposal<A>>,
@@ -500,7 +493,7 @@ pub struct QueryProposalsResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryProposalsResponse<A>
 {
     const NAME: &'static str = "QueryProposalsResponse";
@@ -742,9 +735,7 @@ impl ::prost::Name for QueryTallyResultResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgSubmitProposal<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgSubmitProposal<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " messages are the arbitrary messages to be executed if proposal passes."]
     #[prost(message, repeated, tag = "1")]
     pub messages: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
@@ -768,7 +759,7 @@ pub struct MsgSubmitProposal<
     #[prost(string, tag = "6")]
     pub summary: ::prost::alloc::string::String,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgSubmitProposal<A>
 {
     const NAME: &'static str = "MsgSubmitProposal";
@@ -798,9 +789,7 @@ impl ::prost::Name for MsgSubmitProposalResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgExecLegacyContent<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgExecLegacyContent<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " content is the proposal's content."]
     #[prost(message, optional, tag = "1")]
     pub content: ::core::option::Option<crate::any::Any<A>>,
@@ -808,7 +797,7 @@ pub struct MsgExecLegacyContent<
     #[prost(string, tag = "2")]
     pub authority: ::prost::alloc::string::String,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgExecLegacyContent<A>
 {
     const NAME: &'static str = "MsgExecLegacyContent";
diff --git a/packages/proto/src/gen/cosmos.gov.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.gov.v1beta1.abstract.rs
index 2f5c858..b083245 100644
--- a/packages/proto/src/gen/cosmos.gov.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.gov.v1beta1.abstract.rs
@@ -66,7 +66,7 @@ impl ::prost::Name for Deposit {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Proposal<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Proposal<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " proposal_id defines the unique id of the proposal."]
     #[prost(uint64, tag = "1")]
     pub proposal_id: u64,
@@ -97,9 +97,7 @@ pub struct Proposal<A: Clone + PartialEq + Default + Send + Sync + prost::Messag
     #[prost(message, optional, tag = "9")]
     pub voting_end_time: ::core::option::Option<::pbjson_types::Timestamp>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Proposal<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Proposal<A> {
     const NAME: &'static str = "Proposal";
     const PACKAGE: &'static str = "cosmos.gov.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -341,8 +339,7 @@ impl ProposalStatus {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " starting_proposal_id is the ID of the starting proposal."]
     #[prost(uint64, tag = "1")]
     pub starting_proposal_id: u64,
@@ -365,7 +362,7 @@ pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Me
     #[prost(message, optional, tag = "7")]
     pub tally_params: ::core::option::Option<TallyParams>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
@@ -394,13 +391,11 @@ impl ::prost::Name for QueryProposalRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryProposalResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryProposalResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, optional, tag = "1")]
     pub proposal: ::core::option::Option<Proposal<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryProposalResponse<A>
 {
     const NAME: &'static str = "QueryProposalResponse";
@@ -439,9 +434,7 @@ impl ::prost::Name for QueryProposalsRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryProposalsResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryProposalsResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " proposals defines all the requested governance proposals."]
     #[prost(message, repeated, tag = "1")]
     pub proposals: ::prost::alloc::vec::Vec<Proposal<A>>,
@@ -449,7 +442,7 @@ pub struct QueryProposalsResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryProposalsResponse<A>
 {
     const NAME: &'static str = "QueryProposalsResponse";
@@ -680,9 +673,7 @@ impl ::prost::Name for QueryTallyResultResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgSubmitProposal<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgSubmitProposal<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " content is the proposal's content."]
     #[prost(message, optional, tag = "1")]
     pub content: ::core::option::Option<crate::any::Any<A>>,
@@ -693,7 +684,7 @@ pub struct MsgSubmitProposal<
     #[prost(string, tag = "3")]
     pub proposer: ::prost::alloc::string::String,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgSubmitProposal<A>
 {
     const NAME: &'static str = "MsgSubmitProposal";
diff --git a/packages/proto/src/gen/cosmos.group.v1.abstract.rs b/packages/proto/src/gen/cosmos.group.v1.abstract.rs
index 106249c..e6a6ecf 100644
--- a/packages/proto/src/gen/cosmos.group.v1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.group.v1.abstract.rs
@@ -185,9 +185,7 @@ impl ::prost::Name for GroupMember {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GroupPolicyInfo<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct GroupPolicyInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " address is the account address of group policy."]
     #[prost(string, tag = "1")]
     pub address: ::prost::alloc::string::String,
@@ -213,7 +211,7 @@ pub struct GroupPolicyInfo<
     #[prost(message, optional, tag = "7")]
     pub created_at: ::core::option::Option<::pbjson_types::Timestamp>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GroupPolicyInfo<A>
 {
     const NAME: &'static str = "GroupPolicyInfo";
@@ -229,7 +227,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Proposal<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Proposal<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " id is the unique id of the proposal."]
     #[prost(uint64, tag = "1")]
     pub id: u64,
@@ -290,9 +288,7 @@ pub struct Proposal<A: Clone + PartialEq + Default + Send + Sync + prost::Messag
     #[prost(string, tag = "14")]
     pub summary: ::prost::alloc::string::String,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Proposal<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Proposal<A> {
     const NAME: &'static str = "Proposal";
     const PACKAGE: &'static str = "cosmos.group.v1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -696,8 +692,8 @@ impl ::prost::Name for EventProposalPruned {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GenesisState<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " group_seq is the group table orm.Sequence,"]
     #[doc = " it is used to get the next group ID."]
@@ -728,8 +724,8 @@ pub struct GenesisState<
     pub votes: ::prost::alloc::vec::Vec<Vote>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for GenesisState<A, BB>
 {
     const NAME: &'static str = "GenesisState";
@@ -791,13 +787,13 @@ impl ::prost::Name for QueryGroupPolicyInfoRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryGroupPolicyInfoResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " info is the GroupPolicyInfo of the group policy."]
     #[prost(message, optional, tag = "1")]
     pub info: ::core::option::Option<GroupPolicyInfo<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryGroupPolicyInfoResponse<A>
 {
     const NAME: &'static str = "QueryGroupPolicyInfoResponse";
@@ -906,7 +902,7 @@ impl ::prost::Name for QueryGroupPoliciesByGroupRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryGroupPoliciesByGroupResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " group_policies are the group policies info associated with the provided group."]
     #[prost(message, repeated, tag = "1")]
@@ -915,7 +911,7 @@ pub struct QueryGroupPoliciesByGroupResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryGroupPoliciesByGroupResponse<A>
 {
     const NAME: &'static str = "QueryGroupPoliciesByGroupResponse";
@@ -948,7 +944,7 @@ impl ::prost::Name for QueryGroupPoliciesByAdminRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryGroupPoliciesByAdminResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " group_policies are the group policies info with provided admin."]
     #[prost(message, repeated, tag = "1")]
@@ -957,7 +953,7 @@ pub struct QueryGroupPoliciesByAdminResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryGroupPoliciesByAdminResponse<A>
 {
     const NAME: &'static str = "QueryGroupPoliciesByAdminResponse";
@@ -986,14 +982,12 @@ impl ::prost::Name for QueryProposalRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryProposalResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryProposalResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " proposal is the proposal info."]
     #[prost(message, optional, tag = "1")]
     pub proposal: ::core::option::Option<Proposal<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryProposalResponse<A>
 {
     const NAME: &'static str = "QueryProposalResponse";
@@ -1026,7 +1020,7 @@ impl ::prost::Name for QueryProposalsByGroupPolicyRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryProposalsByGroupPolicyResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " proposals are the proposals with given group policy."]
     #[prost(message, repeated, tag = "1")]
@@ -1035,7 +1029,7 @@ pub struct QueryProposalsByGroupPolicyResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryProposalsByGroupPolicyResponse<A>
 {
     const NAME: &'static str = "QueryProposalsByGroupPolicyResponse";
@@ -1409,9 +1403,7 @@ impl ::prost::Name for MsgUpdateGroupMetadataResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgCreateGroupPolicy<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgCreateGroupPolicy<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " admin is the account address of the group admin."]
     #[prost(string, tag = "1")]
     pub admin: ::prost::alloc::string::String,
@@ -1425,7 +1417,7 @@ pub struct MsgCreateGroupPolicy<
     #[prost(message, optional, tag = "4")]
     pub decision_policy: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgCreateGroupPolicy<A>
 {
     const NAME: &'static str = "MsgCreateGroupPolicy";
@@ -1488,9 +1480,7 @@ impl ::prost::Name for MsgUpdateGroupPolicyAdminResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgCreateGroupWithPolicy<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgCreateGroupWithPolicy<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " admin is the account address of the group and group policy admin."]
     #[prost(string, tag = "1")]
     pub admin: ::prost::alloc::string::String,
@@ -1511,7 +1501,7 @@ pub struct MsgCreateGroupWithPolicy<
     #[prost(message, optional, tag = "6")]
     pub decision_policy: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgCreateGroupWithPolicy<A>
 {
     const NAME: &'static str = "MsgCreateGroupWithPolicy";
@@ -1544,7 +1534,7 @@ impl ::prost::Name for MsgCreateGroupWithPolicyResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgUpdateGroupPolicyDecisionPolicy<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " admin is the account address of the group admin."]
     #[prost(string, tag = "1")]
@@ -1556,7 +1546,7 @@ pub struct MsgUpdateGroupPolicyDecisionPolicy<
     #[prost(message, optional, tag = "3")]
     pub decision_policy: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgUpdateGroupPolicyDecisionPolicy<A>
 {
     const NAME: &'static str = "MsgUpdateGroupPolicyDecisionPolicy";
@@ -1615,9 +1605,7 @@ impl ::prost::Name for MsgUpdateGroupPolicyMetadataResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgSubmitProposal<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgSubmitProposal<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " group_policy_address is the account address of group policy."]
     #[prost(string, tag = "1")]
     pub group_policy_address: ::prost::alloc::string::String,
@@ -1647,7 +1635,7 @@ pub struct MsgSubmitProposal<
     #[prost(string, tag = "7")]
     pub summary: ::prost::alloc::string::String,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgSubmitProposal<A>
 {
     const NAME: &'static str = "MsgSubmitProposal";
diff --git a/packages/proto/src/gen/cosmos.nft.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.nft.v1beta1.abstract.rs
index 9d8631c..f7ca787 100644
--- a/packages/proto/src/gen/cosmos.nft.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.nft.v1beta1.abstract.rs
@@ -71,7 +71,7 @@ impl ::prost::Name for EventBurn {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Class<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Class<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " id defines the unique identifier of the NFT classification, similar to the contract address of ERC721"]
     #[prost(string, tag = "1")]
     pub id: ::prost::alloc::string::String,
@@ -94,9 +94,7 @@ pub struct Class<A: Clone + PartialEq + Default + Send + Sync + prost::Message +
     #[prost(message, optional, tag = "7")]
     pub data: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Class<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Class<A> {
     const NAME: &'static str = "Class";
     const PACKAGE: &'static str = "cosmos.nft.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -107,7 +105,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Nft<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Nft<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " class_id associated with the NFT, similar to the contract address of ERC721"]
     #[prost(string, tag = "1")]
     pub class_id: ::prost::alloc::string::String,
@@ -124,9 +122,7 @@ pub struct Nft<A: Clone + PartialEq + Default + Send + Sync + prost::Message + p
     #[prost(message, optional, tag = "10")]
     pub data: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Nft<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Nft<A> {
     const NAME: &'static str = "NFT";
     const PACKAGE: &'static str = "cosmos.nft.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -138,8 +134,8 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GenesisState<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " class defines the class of the nft type."]
     #[prost(message, repeated, tag = "1")]
@@ -149,8 +145,8 @@ pub struct GenesisState<
     pub entries: ::prost::alloc::vec::Vec<Entry<BB>>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for GenesisState<A, BB>
 {
     const NAME: &'static str = "GenesisState";
@@ -163,7 +159,7 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Entry<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Entry<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " owner is the owner address of the following nft"]
     #[prost(string, tag = "1")]
     pub owner: ::prost::alloc::string::String,
@@ -171,9 +167,7 @@ pub struct Entry<A: Clone + PartialEq + Default + Send + Sync + prost::Message +
     #[prost(message, repeated, tag = "2")]
     pub nfts: ::prost::alloc::vec::Vec<Nft<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Entry<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Entry<A> {
     const NAME: &'static str = "Entry";
     const PACKAGE: &'static str = "cosmos.nft.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -308,9 +302,7 @@ impl ::prost::Name for QueryNfTsRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryNfTsResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryNfTsResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " NFT defines the NFT"]
     #[prost(message, repeated, tag = "1")]
     pub nfts: ::prost::alloc::vec::Vec<Nft<A>>,
@@ -318,7 +310,7 @@ pub struct QueryNfTsResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryNfTsResponse<A>
 {
     const NAME: &'static str = "QueryNFTsResponse";
@@ -350,14 +342,12 @@ impl ::prost::Name for QueryNftRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryNftResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryNftResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " owner is the owner address of the nft"]
     #[prost(message, optional, tag = "1")]
     pub nft: ::core::option::Option<Nft<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryNftResponse<A>
 {
     const NAME: &'static str = "QueryNFTResponse";
@@ -386,14 +376,12 @@ impl ::prost::Name for QueryClassRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryClassResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryClassResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " class defines the class of the nft type."]
     #[prost(message, optional, tag = "1")]
     pub class: ::core::option::Option<Class<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryClassResponse<A>
 {
     const NAME: &'static str = "QueryClassResponse";
@@ -422,9 +410,7 @@ impl ::prost::Name for QueryClassesRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryClassesResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryClassesResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " class defines the class of the nft type."]
     #[prost(message, repeated, tag = "1")]
     pub classes: ::prost::alloc::vec::Vec<Class<A>>,
@@ -432,7 +418,7 @@ pub struct QueryClassesResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryClassesResponse<A>
 {
     const NAME: &'static str = "QueryClassesResponse";
diff --git a/packages/proto/src/gen/cosmos.orm.query.v1alpha1.abstract.rs b/packages/proto/src/gen/cosmos.orm.query.v1alpha1.abstract.rs
index da4bdd6..cbc5545 100644
--- a/packages/proto/src/gen/cosmos.orm.query.v1alpha1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.orm.query.v1alpha1.abstract.rs
@@ -28,14 +28,13 @@ impl ::prost::Name for GetRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GetResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct GetResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " result is the result of the get query. If no value is found, the gRPC"]
     #[doc = " status code NOT_FOUND will be returned."]
     #[prost(message, optional, tag = "1")]
     pub result: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GetResponse<A>
 {
     const NAME: &'static str = "GetResponse";
@@ -134,8 +133,7 @@ impl ::prost::Name for ListRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ListResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct ListResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " results are the results of the query."]
     #[prost(message, repeated, tag = "1")]
     pub results: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
@@ -143,7 +141,7 @@ pub struct ListResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Me
     #[prost(message, optional, tag = "5")]
     pub pagination: ::core::option::Option<super::super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for ListResponse<A>
 {
     const NAME: &'static str = "ListResponse";
diff --git a/packages/proto/src/gen/cosmos.staking.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.staking.v1beta1.abstract.rs
index afa045d..2217eda 100644
--- a/packages/proto/src/gen/cosmos.staking.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.staking.v1beta1.abstract.rs
@@ -112,15 +112,13 @@ impl AuthorizationType {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct HistoricalInfo<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct HistoricalInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, optional, tag = "1")]
     pub header: ::core::option::Option<::tendermint_proto::v0_37::types::Header>,
     #[prost(message, repeated, tag = "2")]
     pub valset: ::prost::alloc::vec::Vec<Validator<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for HistoricalInfo<A>
 {
     const NAME: &'static str = "HistoricalInfo";
@@ -210,7 +208,7 @@ impl ::prost::Name for Description {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Validator<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Validator<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " operator_address defines the address of the validator's operator; bech encoded in JSON."]
     #[prost(string, tag = "1")]
     pub operator_address: ::prost::alloc::string::String,
@@ -253,9 +251,7 @@ pub struct Validator<A: Clone + PartialEq + Default + Send + Sync + prost::Messa
     #[prost(uint64, repeated, tag = "13")]
     pub unbonding_ids: ::prost::alloc::vec::Vec<u64>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Validator<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Validator<A> {
     const NAME: &'static str = "Validator";
     const PACKAGE: &'static str = "cosmos.staking.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -706,8 +702,7 @@ impl Infraction {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " params defines all the parameters of related to deposit."]
     #[prost(message, optional, tag = "1")]
     pub params: ::core::option::Option<Params>,
@@ -734,7 +729,7 @@ pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Me
     #[prost(bool, tag = "8")]
     pub exported: bool,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
@@ -785,9 +780,7 @@ impl ::prost::Name for QueryValidatorsRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryValidatorsResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryValidatorsResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " validators contains all the queried validators."]
     #[prost(message, repeated, tag = "1")]
     pub validators: ::prost::alloc::vec::Vec<Validator<A>>,
@@ -795,7 +788,7 @@ pub struct QueryValidatorsResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryValidatorsResponse<A>
 {
     const NAME: &'static str = "QueryValidatorsResponse";
@@ -824,14 +817,12 @@ impl ::prost::Name for QueryValidatorRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryValidatorResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryValidatorResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " validator defines the validator info."]
     #[prost(message, optional, tag = "1")]
     pub validator: ::core::option::Option<Validator<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryValidatorResponse<A>
 {
     const NAME: &'static str = "QueryValidatorResponse";
@@ -1140,7 +1131,7 @@ impl ::prost::Name for QueryDelegatorValidatorsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryDelegatorValidatorsResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " validators defines the validators' info of a delegator."]
     #[prost(message, repeated, tag = "1")]
@@ -1149,7 +1140,7 @@ pub struct QueryDelegatorValidatorsResponse<
     #[prost(message, optional, tag = "2")]
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryDelegatorValidatorsResponse<A>
 {
     const NAME: &'static str = "QueryDelegatorValidatorsResponse";
@@ -1184,13 +1175,13 @@ impl ::prost::Name for QueryDelegatorValidatorRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryDelegatorValidatorResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " validator defines the validator info."]
     #[prost(message, optional, tag = "1")]
     pub validator: ::core::option::Option<Validator<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryDelegatorValidatorResponse<A>
 {
     const NAME: &'static str = "QueryDelegatorValidatorResponse";
@@ -1222,13 +1213,13 @@ impl ::prost::Name for QueryHistoricalInfoRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryHistoricalInfoResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " hist defines the historical info at the given height."]
     #[prost(message, optional, tag = "1")]
     pub hist: ::core::option::Option<HistoricalInfo<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryHistoricalInfoResponse<A>
 {
     const NAME: &'static str = "QueryHistoricalInfoResponse";
@@ -1297,9 +1288,7 @@ impl ::prost::Name for QueryParamsResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgCreateValidator<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgCreateValidator<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, optional, tag = "1")]
     pub description: ::core::option::Option<Description>,
     #[prost(message, optional, tag = "2")]
@@ -1315,7 +1304,7 @@ pub struct MsgCreateValidator<
     #[prost(message, optional, tag = "7")]
     pub value: ::core::option::Option<super::super::base::v1beta1::Coin>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgCreateValidator<A>
 {
     const NAME: &'static str = "MsgCreateValidator";
diff --git a/packages/proto/src/gen/cosmos.tx.signing.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.tx.signing.v1beta1.abstract.rs
index 16ab334..62494da 100644
--- a/packages/proto/src/gen/cosmos.tx.signing.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.tx.signing.v1beta1.abstract.rs
@@ -2,14 +2,12 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct SignatureDescriptors<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct SignatureDescriptors<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " signatures are the signature descriptors"]
     #[prost(message, repeated, tag = "1")]
     pub signatures: ::prost::alloc::vec::Vec<SignatureDescriptor<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for SignatureDescriptors<A>
 {
     const NAME: &'static str = "SignatureDescriptors";
@@ -25,9 +23,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct SignatureDescriptor<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct SignatureDescriptor<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " public_key is the public key of the signer"]
     #[prost(message, optional, tag = "1")]
     pub public_key: ::core::option::Option<crate::any::Any<A>>,
@@ -122,7 +118,7 @@ pub mod signature_descriptor {
         }
     }
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for SignatureDescriptor<A>
 {
     const NAME: &'static str = "SignatureDescriptor";
diff --git a/packages/proto/src/gen/cosmos.tx.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.tx.v1beta1.abstract.rs
index 3bfb9af..559919f 100644
--- a/packages/proto/src/gen/cosmos.tx.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.tx.v1beta1.abstract.rs
@@ -3,10 +3,10 @@
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct Tx<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " body is the processable content of the transaction"]
     #[prost(message, optional, tag = "1")]
@@ -22,10 +22,10 @@ pub struct Tx<
     pub signatures: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for Tx<A, BB, C, D>
 {
     const NAME: &'static str = "Tx";
@@ -100,9 +100,7 @@ impl ::prost::Name for SignDoc {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct SignDocDirectAux<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct SignDocDirectAux<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " body_bytes is protobuf serialization of a TxBody that matches the"]
     #[doc = " representation in TxRaw."]
     #[prost(bytes = "vec", tag = "1")]
@@ -130,7 +128,7 @@ pub struct SignDocDirectAux<
     #[prost(message, optional, tag = "6")]
     pub tip: ::core::option::Option<Tip>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for SignDocDirectAux<A>
 {
     const NAME: &'static str = "SignDocDirectAux";
@@ -144,9 +142,9 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct TxBody<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " messages is a list of messages to be executed. The required signers of"]
     #[doc = " those messages define the number and order of elements in AuthInfo's"]
@@ -178,9 +176,9 @@ pub struct TxBody<
     pub non_critical_extension_options: ::prost::alloc::vec::Vec<crate::any::Any<C>>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for TxBody<A, BB, C>
 {
     const NAME: &'static str = "TxBody";
@@ -194,7 +192,7 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct AuthInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct AuthInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " signer_infos defines the signing modes for the required signers. The number"]
     #[doc = " and order of elements must match the required signers from TxBody's"]
     #[doc = " messages. The first element is the primary signer and the one which pays"]
@@ -216,9 +214,7 @@ pub struct AuthInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Messag
     #[prost(message, optional, tag = "3")]
     pub tip: ::core::option::Option<Tip>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for AuthInfo<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for AuthInfo<A> {
     const NAME: &'static str = "AuthInfo";
     const PACKAGE: &'static str = "cosmos.tx.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -230,7 +226,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct SignerInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct SignerInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " public_key is the public key of the signer. It is optional for accounts"]
     #[doc = " that already exist in state. If unset, the verifier can use the required \\"]
     #[doc = " signer address for this position and lookup the public key."]
@@ -246,7 +242,7 @@ pub struct SignerInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Mess
     #[prost(uint64, tag = "3")]
     pub sequence: u64,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for SignerInfo<A>
 {
     const NAME: &'static str = "SignerInfo";
@@ -389,9 +385,7 @@ impl ::prost::Name for Tip {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct AuxSignerData<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct AuxSignerData<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " address is the bech32-encoded address of the auxiliary signer. If using"]
     #[doc = " AuxSignerData across different chains, the bech32 prefix of the target"]
     #[doc = " chain (where the final transaction is broadcasted) should be used."]
@@ -409,7 +403,7 @@ pub struct AuxSignerData<
     #[prost(bytes = "vec", tag = "4")]
     pub sig: ::prost::alloc::vec::Vec<u8>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for AuxSignerData<A>
 {
     const NAME: &'static str = "AuxSignerData";
@@ -455,11 +449,11 @@ impl ::prost::Name for GetTxsEventRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GetTxsEventResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    E: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    E: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " txs is the list of queried transactions."]
     #[prost(message, repeated, tag = "1")]
@@ -477,11 +471,11 @@ pub struct GetTxsEventResponse<
     pub total: u64,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        E: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        E: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for GetTxsEventResponse<A, BB, C, D, E>
 {
     const NAME: &'static str = "GetTxsEventResponse";
@@ -514,14 +508,12 @@ impl ::prost::Name for BroadcastTxRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct BroadcastTxResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct BroadcastTxResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " tx_response is the queried TxResponses."]
     #[prost(message, optional, tag = "1")]
     pub tx_response: ::core::option::Option<super::super::base::abci::v1beta1::TxResponse<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for BroadcastTxResponse<A>
 {
     const NAME: &'static str = "BroadcastTxResponse";
@@ -536,10 +528,10 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct SimulateRequest<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " tx is the transaction to simulate."]
     #[doc = " Deprecated. Send raw tx bytes instead."]
@@ -553,10 +545,10 @@ pub struct SimulateRequest<
     pub tx_bytes: ::prost::alloc::vec::Vec<u8>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for SimulateRequest<A, BB, C, D>
 {
     const NAME: &'static str = "SimulateRequest";
@@ -570,9 +562,7 @@ impl<
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct SimulateResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct SimulateResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " gas_info is the information about gas used in the simulation."]
     #[prost(message, optional, tag = "1")]
     pub gas_info: ::core::option::Option<super::super::base::abci::v1beta1::GasInfo>,
@@ -580,7 +570,7 @@ pub struct SimulateResponse<
     #[prost(message, optional, tag = "2")]
     pub result: ::core::option::Option<super::super::base::abci::v1beta1::Result<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for SimulateResponse<A>
 {
     const NAME: &'static str = "SimulateResponse";
@@ -611,11 +601,11 @@ impl ::prost::Name for GetTxRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GetTxResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    E: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    E: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " tx is the queried transaction."]
     #[prost(message, optional, tag = "1")]
@@ -625,11 +615,11 @@ pub struct GetTxResponse<
     pub tx_response: ::core::option::Option<super::super::base::abci::v1beta1::TxResponse<E>>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        E: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        E: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for GetTxResponse<A, BB, C, D, E>
 {
     const NAME: &'static str = "GetTxResponse";
@@ -667,10 +657,10 @@ impl ::prost::Name for GetBlockWithTxsRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GetBlockWithTxsResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " txs are the transactions in the block."]
     #[prost(message, repeated, tag = "1")]
@@ -684,10 +674,10 @@ pub struct GetBlockWithTxsResponse<
     pub pagination: ::core::option::Option<super::super::base::query::v1beta1::PageResponse>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for GetBlockWithTxsResponse<A, BB, C, D>
 {
     const NAME: &'static str = "GetBlockWithTxsResponse";
@@ -723,20 +713,20 @@ impl ::prost::Name for TxDecodeRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct TxDecodeResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " tx is the decoded transaction."]
     #[prost(message, optional, tag = "1")]
     pub tx: ::core::option::Option<Tx<A, BB, C, D>>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for TxDecodeResponse<A, BB, C, D>
 {
     const NAME: &'static str = "TxDecodeResponse";
@@ -753,20 +743,20 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct TxEncodeRequest<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    D: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " tx is the transaction to encode."]
     #[prost(message, optional, tag = "1")]
     pub tx: ::core::option::Option<Tx<A, BB, C, D>>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        C: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        D: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        C: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        D: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for TxEncodeRequest<A, BB, C, D>
 {
     const NAME: &'static str = "TxEncodeRequest";
diff --git a/packages/proto/src/gen/cosmos.upgrade.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.upgrade.v1beta1.abstract.rs
index da2aa7c..bc91c71 100644
--- a/packages/proto/src/gen/cosmos.upgrade.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.upgrade.v1beta1.abstract.rs
@@ -2,7 +2,7 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Plan<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Plan<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " Sets the name for the upgrade. This name will be used by the upgraded"]
     #[doc = " version of the software to apply any special \"on-upgrade\" commands during"]
     #[doc = " the first BeginBlock method after the upgrade is applied. It is also used"]
@@ -32,9 +32,7 @@ pub struct Plan<A: Clone + PartialEq + Default + Send + Sync + prost::Message +
     #[prost(message, optional, tag = "5")]
     pub upgraded_client_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Plan<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Plan<A> {
     const NAME: &'static str = "Plan";
     const PACKAGE: &'static str = "cosmos.upgrade.v1beta1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -48,9 +46,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct SoftwareUpgradeProposal<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct SoftwareUpgradeProposal<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " title of the proposal"]
     #[prost(string, tag = "1")]
     pub title: ::prost::alloc::string::String,
@@ -61,7 +57,7 @@ pub struct SoftwareUpgradeProposal<
     #[prost(message, optional, tag = "3")]
     pub plan: ::core::option::Option<Plan<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for SoftwareUpgradeProposal<A>
 {
     const NAME: &'static str = "SoftwareUpgradeProposal";
@@ -131,14 +127,12 @@ impl ::prost::Name for QueryCurrentPlanRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryCurrentPlanResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryCurrentPlanResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " plan is the current upgrade plan."]
     #[prost(message, optional, tag = "1")]
     pub plan: ::core::option::Option<Plan<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryCurrentPlanResponse<A>
 {
     const NAME: &'static str = "QueryCurrentPlanResponse";
@@ -293,9 +287,7 @@ impl ::prost::Name for QueryAuthorityResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgSoftwareUpgrade<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgSoftwareUpgrade<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " authority is the address that controls the module (defaults to x/gov unless overwritten)."]
     #[prost(string, tag = "1")]
     pub authority: ::prost::alloc::string::String,
@@ -303,7 +295,7 @@ pub struct MsgSoftwareUpgrade<
     #[prost(message, optional, tag = "2")]
     pub plan: ::core::option::Option<Plan<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgSoftwareUpgrade<A>
 {
     const NAME: &'static str = "MsgSoftwareUpgrade";
diff --git a/packages/proto/src/gen/cosmos.vesting.v1beta1.abstract.rs b/packages/proto/src/gen/cosmos.vesting.v1beta1.abstract.rs
index 6c8e68e..358d33c 100644
--- a/packages/proto/src/gen/cosmos.vesting.v1beta1.abstract.rs
+++ b/packages/proto/src/gen/cosmos.vesting.v1beta1.abstract.rs
@@ -3,9 +3,7 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct BaseVestingAccount<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct BaseVestingAccount<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, optional, tag = "1")]
     pub base_account: ::core::option::Option<super::super::auth::v1beta1::BaseAccount<A>>,
     #[prost(message, repeated, tag = "2")]
@@ -18,7 +16,7 @@ pub struct BaseVestingAccount<
     #[prost(int64, tag = "5")]
     pub end_time: i64,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for BaseVestingAccount<A>
 {
     const NAME: &'static str = "BaseVestingAccount";
@@ -32,16 +30,14 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ContinuousVestingAccount<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct ContinuousVestingAccount<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, optional, tag = "1")]
     pub base_vesting_account: ::core::option::Option<BaseVestingAccount<A>>,
     #[doc = " Vesting start time, as unix timestamp (in seconds)."]
     #[prost(int64, tag = "2")]
     pub start_time: i64,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for ContinuousVestingAccount<A>
 {
     const NAME: &'static str = "ContinuousVestingAccount";
@@ -56,13 +52,11 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct DelayedVestingAccount<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct DelayedVestingAccount<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, optional, tag = "1")]
     pub base_vesting_account: ::core::option::Option<BaseVestingAccount<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for DelayedVestingAccount<A>
 {
     const NAME: &'static str = "DelayedVestingAccount";
@@ -94,9 +88,7 @@ impl ::prost::Name for Period {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct PeriodicVestingAccount<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct PeriodicVestingAccount<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, optional, tag = "1")]
     pub base_vesting_account: ::core::option::Option<BaseVestingAccount<A>>,
     #[prost(int64, tag = "2")]
@@ -104,7 +96,7 @@ pub struct PeriodicVestingAccount<
     #[prost(message, repeated, tag = "3")]
     pub vesting_periods: ::prost::alloc::vec::Vec<Period>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for PeriodicVestingAccount<A>
 {
     const NAME: &'static str = "PeriodicVestingAccount";
@@ -121,13 +113,11 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct PermanentLockedAccount<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct PermanentLockedAccount<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, optional, tag = "1")]
     pub base_vesting_account: ::core::option::Option<BaseVestingAccount<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for PermanentLockedAccount<A>
 {
     const NAME: &'static str = "PermanentLockedAccount";
diff --git a/packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs b/packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs
index c3312af..4032ce8 100644
--- a/packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs
+++ b/packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs
@@ -73,8 +73,7 @@ impl ::prost::Name for CodeInfo {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ContractInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct ContractInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " CodeID is the reference to the stored Wasm code"]
     #[prost(uint64, tag = "1")]
     pub code_id: u64,
@@ -97,7 +96,7 @@ pub struct ContractInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Me
     #[prost(message, optional, tag = "7")]
     pub extension: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for ContractInfo<A>
 {
     const NAME: &'static str = "ContractInfo";
@@ -296,16 +295,16 @@ impl ::prost::Name for StoreCodeAuthorization {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ContractExecutionAuthorization<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " Grants for contract executions"]
     #[prost(message, repeated, tag = "1")]
     pub grants: ::prost::alloc::vec::Vec<ContractGrant<A, BB>>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for ContractExecutionAuthorization<A, BB>
 {
     const NAME: &'static str = "ContractExecutionAuthorization";
@@ -320,16 +319,16 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ContractMigrationAuthorization<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " Grants for contract migrations"]
     #[prost(message, repeated, tag = "1")]
     pub grants: ::prost::alloc::vec::Vec<ContractGrant<A, BB>>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for ContractMigrationAuthorization<A, BB>
 {
     const NAME: &'static str = "ContractMigrationAuthorization";
@@ -366,8 +365,8 @@ impl ::prost::Name for CodeGrant {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ContractGrant<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " Contract is the bech32 address of the smart contract"]
     #[prost(string, tag = "1")]
@@ -383,8 +382,8 @@ pub struct ContractGrant<
     pub filter: ::core::option::Option<crate::any::Any<BB>>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for ContractGrant<A, BB>
 {
     const NAME: &'static str = "ContractGrant";
@@ -502,8 +501,7 @@ impl ::prost::Name for AcceptedMessagesFilter {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, optional, tag = "1")]
     pub params: ::core::option::Option<Params>,
     #[prost(message, repeated, tag = "2")]
@@ -513,7 +511,7 @@ pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Me
     #[prost(message, repeated, tag = "4")]
     pub sequences: ::prost::alloc::vec::Vec<Sequence>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
@@ -548,7 +546,7 @@ impl ::prost::Name for Code {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Contract<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Contract<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(string, tag = "1")]
     pub contract_address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
@@ -558,9 +556,7 @@ pub struct Contract<A: Clone + PartialEq + Default + Send + Sync + prost::Messag
     #[prost(message, repeated, tag = "4")]
     pub contract_code_history: ::prost::alloc::vec::Vec<ContractCodeHistoryEntry>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Contract<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Contract<A> {
     const NAME: &'static str = "Contract";
     const PACKAGE: &'static str = "cosmwasm.wasm.v1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -1098,16 +1094,15 @@ impl ::prost::Name for QueryContractInfoRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryContractInfoResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryContractInfoResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message>
+{
     #[doc = " address is the address of the contract"]
     #[prost(string, tag = "1")]
     pub address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
     pub contract_info: ::core::option::Option<ContractInfo<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryContractInfoResponse<A>
 {
     const NAME: &'static str = "QueryContractInfoResponse";
diff --git a/packages/proto/src/gen/ibc.applications.interchain_accounts.v1.abstract.rs b/packages/proto/src/gen/ibc.applications.interchain_accounts.v1.abstract.rs
index 7fa5417..5a90e6e 100644
--- a/packages/proto/src/gen/ibc.applications.interchain_accounts.v1.abstract.rs
+++ b/packages/proto/src/gen/ibc.applications.interchain_accounts.v1.abstract.rs
@@ -21,13 +21,11 @@ impl ::prost::Name for InterchainAccountPacketData {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct CosmosTx<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct CosmosTx<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, repeated, tag = "1")]
     pub messages: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for CosmosTx<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for CosmosTx<A> {
     const NAME: &'static str = "CosmosTx";
     const PACKAGE: &'static str = "ibc.applications.interchain_accounts.v1";
     fn full_name() -> ::prost::alloc::string::String {
@@ -80,16 +78,14 @@ impl Type {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct InterchainAccount<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct InterchainAccount<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(message, optional, tag = "1")]
     pub base_account:
         ::core::option::Option<super::super::super::super::cosmos::auth::v1beta1::BaseAccount<A>>,
     #[prost(string, tag = "2")]
     pub account_owner: ::prost::alloc::string::String,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for InterchainAccount<A>
 {
     const NAME: &'static str = "InterchainAccount";
diff --git a/packages/proto/src/gen/ibc.core.channel.v1.abstract.rs b/packages/proto/src/gen/ibc.core.channel.v1.abstract.rs
index 1edaf5c..9ce5c99 100644
--- a/packages/proto/src/gen/ibc.core.channel.v1.abstract.rs
+++ b/packages/proto/src/gen/ibc.core.channel.v1.abstract.rs
@@ -520,7 +520,7 @@ impl ::prost::Name for QueryChannelClientStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryChannelClientStateResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " client state associated with the channel"]
     #[prost(message, optional, tag = "1")]
@@ -533,7 +533,7 @@ pub struct QueryChannelClientStateResponse<
     #[prost(message, optional, tag = "3")]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryChannelClientStateResponse<A>
 {
     const NAME: &'static str = "QueryChannelClientStateResponse";
@@ -574,7 +574,7 @@ impl ::prost::Name for QueryChannelConsensusStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryChannelConsensusStateResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " consensus state associated with the channel"]
     #[prost(message, optional, tag = "1")]
@@ -589,7 +589,7 @@ pub struct QueryChannelConsensusStateResponse<
     #[prost(message, optional, tag = "4")]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryChannelConsensusStateResponse<A>
 {
     const NAME: &'static str = "QueryChannelConsensusStateResponse";
diff --git a/packages/proto/src/gen/ibc.core.client.v1.abstract.rs b/packages/proto/src/gen/ibc.core.client.v1.abstract.rs
index 2723185..88c095d 100644
--- a/packages/proto/src/gen/ibc.core.client.v1.abstract.rs
+++ b/packages/proto/src/gen/ibc.core.client.v1.abstract.rs
@@ -3,9 +3,7 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct IdentifiedClientState<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct IdentifiedClientState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " client identifier"]
     #[prost(string, tag = "1")]
     pub client_id: ::prost::alloc::string::String,
@@ -13,7 +11,7 @@ pub struct IdentifiedClientState<
     #[prost(message, optional, tag = "2")]
     pub client_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for IdentifiedClientState<A>
 {
     const NAME: &'static str = "IdentifiedClientState";
@@ -27,9 +25,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ConsensusStateWithHeight<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct ConsensusStateWithHeight<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " consensus state height"]
     #[prost(message, optional, tag = "1")]
     pub height: ::core::option::Option<Height>,
@@ -37,7 +33,7 @@ pub struct ConsensusStateWithHeight<
     #[prost(message, optional, tag = "2")]
     pub consensus_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for ConsensusStateWithHeight<A>
 {
     const NAME: &'static str = "ConsensusStateWithHeight";
@@ -51,9 +47,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ClientConsensusStates<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct ClientConsensusStates<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " client identifier"]
     #[prost(string, tag = "1")]
     pub client_id: ::prost::alloc::string::String,
@@ -61,7 +55,7 @@ pub struct ClientConsensusStates<
     #[prost(message, repeated, tag = "2")]
     pub consensus_states: ::prost::alloc::vec::Vec<ConsensusStateWithHeight<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for ClientConsensusStates<A>
 {
     const NAME: &'static str = "ClientConsensusStates";
@@ -105,8 +99,8 @@ impl ::prost::Name for ClientUpdateProposal {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct UpgradeProposal<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[prost(string, tag = "1")]
     pub title: ::prost::alloc::string::String,
@@ -124,8 +118,8 @@ pub struct UpgradeProposal<
     pub upgraded_client_state: ::core::option::Option<crate::any::Any<BB>>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for UpgradeProposal<A, BB>
 {
     const NAME: &'static str = "UpgradeProposal";
@@ -185,8 +179,8 @@ impl ::prost::Name for Params {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GenesisState<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " client states with their corresponding identifiers"]
     #[prost(message, repeated, tag = "1")]
@@ -207,8 +201,8 @@ pub struct GenesisState<
     pub next_client_sequence: u64,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for GenesisState<A, BB>
 {
     const NAME: &'static str = "GenesisState";
@@ -278,9 +272,7 @@ impl ::prost::Name for QueryClientStateRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryClientStateResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryClientStateResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " client state associated with the request identifier"]
     #[prost(message, optional, tag = "1")]
     pub client_state: ::core::option::Option<crate::any::Any<A>>,
@@ -291,7 +283,7 @@ pub struct QueryClientStateResponse<
     #[prost(message, optional, tag = "3")]
     pub proof_height: ::core::option::Option<Height>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryClientStateResponse<A>
 {
     const NAME: &'static str = "QueryClientStateResponse";
@@ -324,9 +316,8 @@ impl ::prost::Name for QueryClientStatesRequest {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct QueryClientStatesResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct QueryClientStatesResponse<A: Clone + PartialEq + Default + Send + Sync + prost::Message>
+{
     #[doc = " list of stored ClientStates of the chain."]
     #[prost(message, repeated, tag = "1")]
     pub client_states: ::prost::alloc::vec::Vec<IdentifiedClientState<A>>,
@@ -336,7 +327,7 @@ pub struct QueryClientStatesResponse<
         super::super::super::super::cosmos::base::query::v1beta1::PageResponse,
     >,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryClientStatesResponse<A>
 {
     const NAME: &'static str = "QueryClientStatesResponse";
@@ -379,7 +370,7 @@ impl ::prost::Name for QueryConsensusStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryConsensusStateResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " consensus state associated with the client identifier at the given height"]
     #[prost(message, optional, tag = "1")]
@@ -391,7 +382,7 @@ pub struct QueryConsensusStateResponse<
     #[prost(message, optional, tag = "3")]
     pub proof_height: ::core::option::Option<Height>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryConsensusStateResponse<A>
 {
     const NAME: &'static str = "QueryConsensusStateResponse";
@@ -428,7 +419,7 @@ impl ::prost::Name for QueryConsensusStatesRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryConsensusStatesResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " consensus states associated with the identifier"]
     #[prost(message, repeated, tag = "1")]
@@ -439,7 +430,7 @@ pub struct QueryConsensusStatesResponse<
         super::super::super::super::cosmos::base::query::v1beta1::PageResponse,
     >,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryConsensusStatesResponse<A>
 {
     const NAME: &'static str = "QueryConsensusStatesResponse";
@@ -574,13 +565,13 @@ impl ::prost::Name for QueryUpgradedClientStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryUpgradedClientStateResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " client state associated with the request identifier"]
     #[prost(message, optional, tag = "1")]
     pub upgraded_client_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryUpgradedClientStateResponse<A>
 {
     const NAME: &'static str = "QueryUpgradedClientStateResponse";
@@ -608,13 +599,13 @@ impl ::prost::Name for QueryUpgradedConsensusStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryUpgradedConsensusStateResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " Consensus state associated with the request identifier"]
     #[prost(message, optional, tag = "1")]
     pub upgraded_consensus_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryUpgradedConsensusStateResponse<A>
 {
     const NAME: &'static str = "QueryUpgradedConsensusStateResponse";
@@ -628,8 +619,8 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgCreateClient<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " light client state"]
     #[prost(message, optional, tag = "1")]
@@ -643,8 +634,8 @@ pub struct MsgCreateClient<
     pub signer: ::prost::alloc::string::String,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for MsgCreateClient<A, BB>
 {
     const NAME: &'static str = "MsgCreateClient";
@@ -670,9 +661,7 @@ impl ::prost::Name for MsgCreateClientResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgUpdateClient<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgUpdateClient<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " client unique identifier"]
     #[prost(string, tag = "1")]
     pub client_id: ::prost::alloc::string::String,
@@ -683,7 +672,7 @@ pub struct MsgUpdateClient<
     #[prost(string, tag = "3")]
     pub signer: ::prost::alloc::string::String,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgUpdateClient<A>
 {
     const NAME: &'static str = "MsgUpdateClient";
@@ -710,8 +699,8 @@ impl ::prost::Name for MsgUpdateClientResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct MsgUpgradeClient<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " client unique identifier"]
     #[prost(string, tag = "1")]
@@ -734,8 +723,8 @@ pub struct MsgUpgradeClient<
     pub signer: ::prost::alloc::string::String,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for MsgUpgradeClient<A, BB>
 {
     const NAME: &'static str = "MsgUpgradeClient";
@@ -762,9 +751,7 @@ impl ::prost::Name for MsgUpgradeClientResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgSubmitMisbehaviour<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgSubmitMisbehaviour<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " client unique identifier"]
     #[deprecated]
     #[prost(string, tag = "1")]
@@ -778,7 +765,7 @@ pub struct MsgSubmitMisbehaviour<
     #[prost(string, tag = "3")]
     pub signer: ::prost::alloc::string::String,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgSubmitMisbehaviour<A>
 {
     const NAME: &'static str = "MsgSubmitMisbehaviour";
diff --git a/packages/proto/src/gen/ibc.core.connection.v1.abstract.rs b/packages/proto/src/gen/ibc.core.connection.v1.abstract.rs
index 9184452..0fecc63 100644
--- a/packages/proto/src/gen/ibc.core.connection.v1.abstract.rs
+++ b/packages/proto/src/gen/ibc.core.connection.v1.abstract.rs
@@ -382,7 +382,7 @@ impl ::prost::Name for QueryConnectionClientStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryConnectionClientStateResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " client state associated with the channel"]
     #[prost(message, optional, tag = "1")]
@@ -395,7 +395,7 @@ pub struct QueryConnectionClientStateResponse<
     #[prost(message, optional, tag = "3")]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryConnectionClientStateResponse<A>
 {
     const NAME: &'static str = "QueryConnectionClientStateResponse";
@@ -431,7 +431,7 @@ impl ::prost::Name for QueryConnectionConsensusStateRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryConnectionConsensusStateResponse<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " consensus state associated with the channel"]
     #[prost(message, optional, tag = "1")]
@@ -446,7 +446,7 @@ pub struct QueryConnectionConsensusStateResponse<
     #[prost(message, optional, tag = "4")]
     pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for QueryConnectionConsensusStateResponse<A>
 {
     const NAME: &'static str = "QueryConnectionConsensusStateResponse";
@@ -525,9 +525,7 @@ impl ::prost::Name for MsgConnectionOpenInitResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgConnectionOpenTry<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgConnectionOpenTry<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(string, tag = "1")]
     pub client_id: ::prost::alloc::string::String,
     #[doc = " Deprecated: this field is unused. Crossing hellos are no longer supported in core IBC."]
@@ -562,7 +560,7 @@ pub struct MsgConnectionOpenTry<
     #[prost(bytes = "vec", tag = "13")]
     pub host_consensus_state_proof: ::prost::alloc::vec::Vec<u8>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgConnectionOpenTry<A>
 {
     const NAME: &'static str = "MsgConnectionOpenTry";
@@ -588,9 +586,7 @@ impl ::prost::Name for MsgConnectionOpenTryResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgConnectionOpenAck<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct MsgConnectionOpenAck<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(string, tag = "1")]
     pub connection_id: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
@@ -619,7 +615,7 @@ pub struct MsgConnectionOpenAck<
     #[prost(bytes = "vec", tag = "11")]
     pub host_consensus_state_proof: ::prost::alloc::vec::Vec<u8>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for MsgConnectionOpenAck<A>
 {
     const NAME: &'static str = "MsgConnectionOpenAck";
diff --git a/packages/proto/src/gen/ibc.core.types.v1.abstract.rs b/packages/proto/src/gen/ibc.core.types.v1.abstract.rs
index 9dcbaee..0f473de 100644
--- a/packages/proto/src/gen/ibc.core.types.v1.abstract.rs
+++ b/packages/proto/src/gen/ibc.core.types.v1.abstract.rs
@@ -3,8 +3,8 @@
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct GenesisState<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
 > {
     #[doc = " ICS002 - Clients genesis state"]
     #[prost(message, optional, tag = "1")]
@@ -17,8 +17,8 @@ pub struct GenesisState<
     pub channel_genesis: ::core::option::Option<super::super::channel::v1::GenesisState>,
 }
 impl<
-        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message,
     > ::prost::Name for GenesisState<A, BB>
 {
     const NAME: &'static str = "GenesisState";
diff --git a/packages/proto/src/gen/ibc.lightclients.solomachine.v2.abstract.rs b/packages/proto/src/gen/ibc.lightclients.solomachine.v2.abstract.rs
index 20ecb16..8d61cac 100644
--- a/packages/proto/src/gen/ibc.lightclients.solomachine.v2.abstract.rs
+++ b/packages/proto/src/gen/ibc.lightclients.solomachine.v2.abstract.rs
@@ -3,8 +3,7 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ClientState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct ClientState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " latest sequence of the client state"]
     #[prost(uint64, tag = "1")]
     pub sequence: u64,
@@ -18,7 +17,7 @@ pub struct ClientState<A: Clone + PartialEq + Default + Send + Sync + prost::Mes
     #[prost(bool, tag = "4")]
     pub allow_update_after_proposal: bool,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for ClientState<A>
 {
     const NAME: &'static str = "ClientState";
@@ -33,9 +32,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ConsensusState<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct ConsensusState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " public key of the solo machine"]
     #[prost(message, optional, tag = "1")]
     pub public_key: ::core::option::Option<crate::any::Any<A>>,
@@ -47,7 +44,7 @@ pub struct ConsensusState<
     #[prost(uint64, tag = "3")]
     pub timestamp: u64,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for ConsensusState<A>
 {
     const NAME: &'static str = "ConsensusState";
@@ -60,7 +57,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Header<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Header<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " sequence to update solo machine public key at"]
     #[prost(uint64, tag = "1")]
     pub sequence: u64,
@@ -73,9 +70,7 @@ pub struct Header<A: Clone + PartialEq + Default + Send + Sync + prost::Message
     #[prost(string, tag = "5")]
     pub new_diversifier: ::prost::alloc::string::String,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Header<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Header<A> {
     const NAME: &'static str = "Header";
     const PACKAGE: &'static str = "ibc.lightclients.solomachine.v2";
     fn full_name() -> ::prost::alloc::string::String {
@@ -173,7 +168,7 @@ impl ::prost::Name for SignBytes {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct HeaderData<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct HeaderData<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " header public key"]
     #[prost(message, optional, tag = "1")]
     pub new_pub_key: ::core::option::Option<crate::any::Any<A>>,
@@ -181,7 +176,7 @@ pub struct HeaderData<A: Clone + PartialEq + Default + Send + Sync + prost::Mess
     #[prost(string, tag = "2")]
     pub new_diversifier: ::prost::alloc::string::String,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for HeaderData<A>
 {
     const NAME: &'static str = "HeaderData";
@@ -194,15 +189,13 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ClientStateData<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct ClientStateData<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(bytes = "vec", tag = "1")]
     pub path: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "2")]
     pub client_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for ClientStateData<A>
 {
     const NAME: &'static str = "ClientStateData";
@@ -216,15 +209,13 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ConsensusStateData<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct ConsensusStateData<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(bytes = "vec", tag = "1")]
     pub path: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "2")]
     pub consensus_state: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for ConsensusStateData<A>
 {
     const NAME: &'static str = "ConsensusStateData";
diff --git a/packages/proto/src/gen/ibc.lightclients.solomachine.v3.abstract.rs b/packages/proto/src/gen/ibc.lightclients.solomachine.v3.abstract.rs
index 63504e2..c150ab6 100644
--- a/packages/proto/src/gen/ibc.lightclients.solomachine.v3.abstract.rs
+++ b/packages/proto/src/gen/ibc.lightclients.solomachine.v3.abstract.rs
@@ -3,8 +3,7 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ClientState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
-{
+pub struct ClientState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " latest sequence of the client state"]
     #[prost(uint64, tag = "1")]
     pub sequence: u64,
@@ -14,7 +13,7 @@ pub struct ClientState<A: Clone + PartialEq + Default + Send + Sync + prost::Mes
     #[prost(message, optional, tag = "3")]
     pub consensus_state: ::core::option::Option<ConsensusState<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for ClientState<A>
 {
     const NAME: &'static str = "ClientState";
@@ -29,9 +28,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ConsensusState<
-    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
-> {
+pub struct ConsensusState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " public key of the solo machine"]
     #[prost(message, optional, tag = "1")]
     pub public_key: ::core::option::Option<crate::any::Any<A>>,
@@ -43,7 +40,7 @@ pub struct ConsensusState<
     #[prost(uint64, tag = "3")]
     pub timestamp: u64,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for ConsensusState<A>
 {
     const NAME: &'static str = "ConsensusState";
@@ -56,7 +53,7 @@ impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Header<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct Header<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[prost(uint64, tag = "1")]
     pub timestamp: u64,
     #[prost(bytes = "vec", tag = "2")]
@@ -66,9 +63,7 @@ pub struct Header<A: Clone + PartialEq + Default + Send + Sync + prost::Message
     #[prost(string, tag = "4")]
     pub new_diversifier: ::prost::alloc::string::String,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
-    for Header<A>
-{
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name for Header<A> {
     const NAME: &'static str = "Header";
     const PACKAGE: &'static str = "ibc.lightclients.solomachine.v3";
     fn full_name() -> ::prost::alloc::string::String {
@@ -167,7 +162,7 @@ impl ::prost::Name for SignBytes {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct HeaderData<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
+pub struct HeaderData<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
     #[doc = " header public key"]
     #[prost(message, optional, tag = "1")]
     pub new_pub_key: ::core::option::Option<crate::any::Any<A>>,
@@ -175,7 +170,7 @@ pub struct HeaderData<A: Clone + PartialEq + Default + Send + Sync + prost::Mess
     #[prost(string, tag = "2")]
     pub new_diversifier: ::prost::alloc::string::String,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
     for HeaderData<A>
 {
     const NAME: &'static str = "HeaderData";
diff --git a/packages/proto/src/lib.rs b/packages/proto/src/lib.rs
index f7eeb89..6a76873 100644
--- a/packages/proto/src/lib.rs
+++ b/packages/proto/src/lib.rs
@@ -9,6 +9,7 @@
 )]
 #![forbid(unsafe_code)]
 #![warn(trivial_casts, trivial_numeric_casts, unused_import_braces)]
+extern crate core;
 
 #[cfg(feature = "abstract-any")]
 pub mod any;
diff --git a/proto-build/src/parser.rs b/proto-build/src/parser.rs
index 3ca160f..760cafd 100644
--- a/proto-build/src/parser.rs
+++ b/proto-build/src/parser.rs
@@ -178,14 +178,6 @@ fn gen_unnamed_param(name: &str) -> TypeParam {
     type_param
 }
 
-fn gen_type_param(name: &str) -> TypeParam {
-    let mut type_param = gen_unnamed_param(name);
-    type_param
-        .bounds
-        .push(trait_param_bound(vec!["prost", "Name"]));
-    type_param
-}
-
 pub fn generate_advanced_struct(out_dir: &str) -> crate::Result<()> {
     println!("Loading and patching all files containing Any");
     let mut project_tokens = load_and_patch_any(out_dir);
@@ -229,7 +221,7 @@ fn load_and_patch_any(out_dir: &str) -> BTreeMap<String, (File, BTreeMap<String,
                             path.path = gen_any(generic);
                             item.generics
                                 .params
-                                .push(GenericParam::Type(gen_type_param(generic)));
+                                .push(GenericParam::Type(gen_unnamed_param(generic)));
                         }
                     }
                 }
@@ -327,7 +319,7 @@ fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize>)>)
                             let ty_struct = as_struct(
                                 key.items.get_mut(*s.get("GenesisState").unwrap()).unwrap(),
                             )
-                            .unwrap();
+                                .unwrap();
                             new_total_generics = push_generics(ty_struct, ty, new_total_generics);
                         } else if let Some(i) = structs.get(&ident_name) {
                             let ty_item = match i.cmp(&idx) {
@@ -351,7 +343,7 @@ fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize>)>)
                                     .get_mut(*other_structs.get(&ident_name).unwrap())
                                     .unwrap(),
                             )
-                            .unwrap();
+                                .unwrap();
                             new_total_generics = push_generics(ty_struct, ty, new_total_generics);
                         }
                     }
@@ -368,7 +360,7 @@ fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize>)>)
                         curr_struct
                             .generics
                             .params
-                            .push(GenericParam::Type(gen_type_param(gen)));
+                            .push(GenericParam::Type(gen_unnamed_param(gen)));
                     }
                     new_fixes = true;
                 }
@@ -472,13 +464,13 @@ fn save(out_dir: &str, files: &BTreeMap<String, (File, BTreeMap<String, usize>)>
                 ),
             )],
         )
-        .unwrap();
+            .unwrap();
 
         // Export the generated structure and save in file
         fs::write(
             format!("{}/{}", out_dir, new_file),
             quote!(#data).to_string(),
         )
-        .unwrap();
+            .unwrap();
     }
 }

From 50952ecf06dc927344ca8354400bd910c15b67d2 Mon Sep 17 00:00:00 2001
From: Guy Garcia <guy.garcia@protonmail.com>
Date: Wed, 16 Oct 2024 09:43:15 -0400
Subject: [PATCH 5/7] Fixed bug when using Any on cosmos

---
 packages/proto/src/any.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/proto/src/any.rs b/packages/proto/src/any.rs
index ca2f736..7dfcac8 100644
--- a/packages/proto/src/any.rs
+++ b/packages/proto/src/any.rs
@@ -16,7 +16,8 @@ pub struct Any<T: Message + PartialEq + Default> {
 impl<T: Message + Name + PartialEq + Default> Any<T> {
     pub fn new(value: T) -> Self {
         Self {
-            type_url: T::full_name(),
+            // The RPC endpoint fails we dont prepend a '/'
+            type_url: format!("/{}", T::full_name()),
             value,
         }
     }

From d47e9eb5f51ac331bf86586fad77e89e69e0844a Mon Sep 17 00:00:00 2001
From: Guy Garcia <guy.garcia@protonmail.com>
Date: Mon, 4 Nov 2024 16:33:04 -0400
Subject: [PATCH 6/7] fixed conflicts with main

---
 .../src/gen/archway.cwica.v1.abstract.rs      |  55 +-
 .../src/gen/archway.genmsg.v1.abstract.rs     |   5 +-
 .../src/gen/cosmwasm.wasm.v1.abstract.rs      | 366 ++------------
 proto-build/src/parser.rs                     | 476 ------------------
 .../src/parser/commands/load_and_patch_any.rs |  57 +--
 .../src/parser/commands/patch_generics.rs     | 103 ++--
 .../src/parser/utils/gen_type_param.rs        |  39 +-
 proto-build/src/parser/utils/mod.rs           |   1 +
 8 files changed, 115 insertions(+), 987 deletions(-)
 delete mode 100644 proto-build/src/parser.rs

diff --git a/packages/proto/src/gen/archway.cwica.v1.abstract.rs b/packages/proto/src/gen/archway.cwica.v1.abstract.rs
index e62f9e4..58b1d53 100644
--- a/packages/proto/src/gen/archway.cwica.v1.abstract.rs
+++ b/packages/proto/src/gen/archway.cwica.v1.abstract.rs
@@ -66,10 +66,6 @@ impl ::prost::Name for Params {
 pub struct GenesisState {
     #[doc = " params defines all the parameters of the module."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for GenesisState {
@@ -98,10 +94,6 @@ impl ::prost::Name for QueryParamsRequest {
 pub struct QueryParamsResponse {
     #[doc = " params defines the parameters for the module"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for QueryParamsResponse {
@@ -119,10 +111,6 @@ impl ::prost::Name for QueryParamsResponse {
 pub struct SudoPayload {
     #[doc = " ICA is the message which carries the success responses"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub ica: ::core::option::Option<IcaSuccess>,
 }
 impl ::prost::Name for SudoPayload {
@@ -140,18 +128,10 @@ pub struct IcaSuccess {
     #[doc = " account_registered is the message which carries the success response after"]
     #[doc = " the ica account has been registered"]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub account_registered: ::core::option::Option<AccountRegistered>,
     #[doc = " tx_executed is the message which carries the success response after the ica"]
     #[doc = " tx has been executed"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub tx_executed: ::core::option::Option<TxExecuted>,
 }
 impl ::prost::Name for IcaSuccess {
@@ -236,17 +216,7 @@ impl ::prost::Name for MsgRegisterInterchainAccountResponse {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct MsgSendTx<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct MsgSendTx<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[doc = " contract_address is the address of the who wants to submit a transaction to"]
     #[doc = " the counterparty chain"]
     #[prost(string, tag = "1")]
@@ -256,11 +226,7 @@ pub struct MsgSendTx<
     pub connection_id: ::prost::alloc::string::String,
     #[doc = " msgs are the messages to be submitted to the counterparty chain"]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::serialize",
-        deserialize_with = "crate::any::vec::deserialize"
-    )]
-    pub msgs: ::prost::alloc::vec::Vec<A>,
+    pub msgs: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
     #[doc = " memo is the memo to be included in the packet"]
     #[prost(string, tag = "4")]
     pub memo: ::prost::alloc::string::String,
@@ -268,17 +234,8 @@ pub struct MsgSendTx<
     #[prost(uint64, tag = "5")]
     pub timeout: u64,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for MsgSendTx<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for MsgSendTx<A>
 {
     const NAME: &'static str = "MsgSendTx";
     const PACKAGE: &'static str = "archway.cwica.v1";
@@ -318,10 +275,6 @@ pub struct MsgUpdateParams {
     #[doc = " params deines the module parmeters to update"]
     #[doc = " NOTE: All parameters must be supplied."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for MsgUpdateParams {
diff --git a/packages/proto/src/gen/archway.genmsg.v1.abstract.rs b/packages/proto/src/gen/archway.genmsg.v1.abstract.rs
index ddfa13f..df33063 100644
--- a/packages/proto/src/gen/archway.genmsg.v1.abstract.rs
+++ b/packages/proto/src/gen/archway.genmsg.v1.abstract.rs
@@ -2,11 +2,12 @@
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message> {
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[prost(message, repeated, tag = "1")]
     pub messages: ::prost::alloc::vec::Vec<crate::any::Any<A>>,
 }
-impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message> ::prost::Name
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
     for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
diff --git a/packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs b/packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs
index bdeffa1..6d1bd7f 100644
--- a/packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs
+++ b/packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs
@@ -36,10 +36,6 @@ impl ::prost::Name for AccessConfig {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct Params {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub code_upload_access: ::core::option::Option<AccessConfig>,
     #[prost(enumeration = "AccessType", tag = "2")]
     pub instantiate_default_permission: i32,
@@ -64,10 +60,6 @@ pub struct CodeInfo {
     pub creator: ::prost::alloc::string::String,
     #[doc = " InstantiateConfig access control to apply on contract creation, optional"]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_config: ::core::option::Option<AccessConfig>,
 }
 impl ::prost::Name for CodeInfo {
@@ -81,17 +73,8 @@ impl ::prost::Name for CodeInfo {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct ContractInfo<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct ContractInfo<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[doc = " CodeID is the reference to the stored Wasm code"]
     #[prost(uint64, tag = "1")]
     pub code_id: u64,
@@ -106,33 +89,16 @@ pub struct ContractInfo<
     pub label: ::prost::alloc::string::String,
     #[doc = " Created Tx position when the contract was instantiated."]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub created: ::core::option::Option<AbsoluteTxPosition>,
     #[prost(string, tag = "6")]
     pub ibc_port_id: ::prost::alloc::string::String,
     #[doc = " Extension is an extension point to store custom metadata within the"]
     #[doc = " persistence model."]
     #[prost(message, optional, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub extension: ::core::option::Option<A>,
+    pub extension: ::core::option::Option<crate::any::Any<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for ContractInfo<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for ContractInfo<A>
 {
     const NAME: &'static str = "ContractInfo";
     const PACKAGE: &'static str = "cosmwasm.wasm.v1";
@@ -152,10 +118,6 @@ pub struct ContractCodeHistoryEntry {
     pub code_id: u64,
     #[doc = " Updated Tx position when the operation was executed."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub updated: ::core::option::Option<AbsoluteTxPosition>,
     #[prost(bytes = "vec", tag = "4")]
     pub msg: ::prost::alloc::vec::Vec<u8>,
@@ -319,10 +281,6 @@ impl ContractCodeHistoryOperationType {
 pub struct StoreCodeAuthorization {
     #[doc = " Grants for code upload"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub grants: ::prost::alloc::vec::Vec<CodeGrant>,
 }
 impl ::prost::Name for StoreCodeAuthorization {
@@ -338,52 +296,16 @@ impl ::prost::Name for StoreCodeAuthorization {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ContractExecutionAuthorization<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " Grants for contract executions"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub grants: ::prost::alloc::vec::Vec<ContractGrant<A, BB>>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for ContractExecutionAuthorization<A, BB>
 {
     const NAME: &'static str = "ContractExecutionAuthorization";
@@ -398,52 +320,16 @@ impl<
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ContractMigrationAuthorization<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " Grants for contract migrations"]
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub grants: ::prost::alloc::vec::Vec<ContractGrant<A, BB>>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for ContractMigrationAuthorization<A, BB>
 {
     const NAME: &'static str = "ContractMigrationAuthorization";
@@ -465,10 +351,6 @@ pub struct CodeGrant {
     #[doc = " on contract creation."]
     #[doc = " Optional"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
 }
 impl ::prost::Name for CodeGrant {
@@ -484,24 +366,8 @@ impl ::prost::Name for CodeGrant {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct ContractGrant<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-    BB: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+    BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " Contract is the bech32 address of the smart contract"]
     #[prost(string, tag = "1")]
@@ -509,40 +375,16 @@ pub struct ContractGrant<
     #[doc = " Limit defines execution limits that are enforced and updated when the grant"]
     #[doc = " is applied. When the limit lapsed the grant is removed."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub limit: ::core::option::Option<A>,
+    pub limit: ::core::option::Option<crate::any::Any<A>>,
     #[doc = " Filter define more fine-grained control on the message payload passed"]
     #[doc = " to the contract in the operation. When no filter applies on execution, the"]
     #[doc = " operation is prohibited."]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::serialize",
-        deserialize_with = "crate::any::option::deserialize"
-    )]
-    pub filter: ::core::option::Option<BB>,
+    pub filter: ::core::option::Option<crate::any::Any<BB>>,
 }
 impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-        BB: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
+        A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
+        BB: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
     > ::prost::Name for ContractGrant<A, BB>
 {
     const NAME: &'static str = "ContractGrant";
@@ -660,53 +502,19 @@ impl ::prost::Name for AcceptedMessagesFilter {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct GenesisState<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct GenesisState<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name>
+{
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
     #[prost(message, repeated, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub codes: ::prost::alloc::vec::Vec<Code>,
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub contracts: ::prost::alloc::vec::Vec<Contract<A>>,
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub sequences: ::prost::alloc::vec::Vec<Sequence>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for GenesisState<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for GenesisState<A>
 {
     const NAME: &'static str = "GenesisState";
     const PACKAGE: &'static str = "cosmwasm.wasm.v1";
@@ -722,10 +530,6 @@ pub struct Code {
     #[prost(uint64, tag = "1")]
     pub code_id: u64,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub code_info: ::core::option::Option<CodeInfo>,
     #[prost(bytes = "vec", tag = "3")]
     pub code_bytes: ::prost::alloc::vec::Vec<u8>,
@@ -744,49 +548,18 @@ impl ::prost::Name for Code {
 #[derive(:: serde :: Serialize, :: serde :: Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
-pub struct Contract<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
-> {
+pub struct Contract<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> {
     #[prost(string, tag = "1")]
     pub contract_address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub contract_info: ::core::option::Option<ContractInfo<A>>,
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub contract_state: ::prost::alloc::vec::Vec<Model>,
     #[prost(message, repeated, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub contract_code_history: ::prost::alloc::vec::Vec<ContractCodeHistoryEntry>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for Contract<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for Contract<A>
 {
     const NAME: &'static str = "Contract";
     const PACKAGE: &'static str = "cosmwasm.wasm.v1";
@@ -892,10 +665,6 @@ pub struct StoreCodeProposal {
     pub wasm_byte_code: ::prost::alloc::vec::Vec<u8>,
     #[doc = " InstantiatePermission to apply on contract creation, optional"]
     #[prost(message, optional, tag = "7")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
     #[doc = " UnpinCode code on upload, optional"]
     #[prost(bool, tag = "8")]
@@ -1215,10 +984,6 @@ pub struct AccessConfigUpdate {
     pub code_id: u64,
     #[doc = " InstantiatePermission to apply to the set of code ids"]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
 }
 impl ::prost::Name for AccessConfigUpdate {
@@ -1245,10 +1010,6 @@ pub struct UpdateInstantiateConfigProposal {
     #[doc = " AccessConfigUpdate contains the list of code ids and the access config"]
     #[doc = " to be applied."]
     #[prost(message, repeated, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub access_config_updates: ::prost::alloc::vec::Vec<AccessConfigUpdate>,
 }
 impl ::prost::Name for UpdateInstantiateConfigProposal {
@@ -1280,10 +1041,6 @@ pub struct StoreAndInstantiateContractProposal {
     pub wasm_byte_code: ::prost::alloc::vec::Vec<u8>,
     #[doc = " InstantiatePermission to apply on contract creation, optional"]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
     #[doc = " UnpinCode code on upload, optional"]
     #[prost(bool, tag = "6")]
@@ -1342,37 +1099,16 @@ impl ::prost::Name for QueryContractInfoRequest {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryContractInfoResponse<
-    A: Clone
-        + PartialEq
-        + Default
-        + Send
-        + Sync
-        + prost::Message
-        + serde::Serialize
-        + serde::de::DeserializeOwned
-        + prost::Name,
+    A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name,
 > {
     #[doc = " address is the address of the contract"]
     #[prost(string, tag = "1")]
     pub address: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub contract_info: ::core::option::Option<ContractInfo<A>>,
 }
-impl<
-        A: Clone
-            + PartialEq
-            + Default
-            + Send
-            + Sync
-            + prost::Message
-            + serde::Serialize
-            + serde::de::DeserializeOwned
-            + prost::Name,
-    > ::prost::Name for QueryContractInfoResponse<A>
+impl<A: Clone + PartialEq + Default + Send + Sync + prost::Message + prost::Name> ::prost::Name
+    for QueryContractInfoResponse<A>
 {
     const NAME: &'static str = "QueryContractInfoResponse";
     const PACKAGE: &'static str = "cosmwasm.wasm.v1";
@@ -1407,10 +1143,6 @@ impl ::prost::Name for QueryContractHistoryRequest {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryContractHistoryResponse {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub entries: ::prost::alloc::vec::Vec<ContractCodeHistoryEntry>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
@@ -1490,10 +1222,6 @@ impl ::prost::Name for QueryAllContractStateRequest {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryAllContractStateResponse {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub models: ::prost::alloc::vec::Vec<Model>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
@@ -1608,10 +1336,6 @@ pub struct CodeInfoResponse {
     #[prost(bytes = "vec", tag = "3")]
     pub data_hash: ::prost::alloc::vec::Vec<u8>,
     #[prost(message, optional, tag = "6")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
 }
 impl ::prost::Name for CodeInfoResponse {
@@ -1627,10 +1351,6 @@ impl ::prost::Name for CodeInfoResponse {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryCodeResponse {
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub code_info: ::core::option::Option<CodeInfoResponse>,
     #[prost(bytes = "vec", tag = "2")]
     pub data: ::prost::alloc::vec::Vec<u8>,
@@ -1664,10 +1384,6 @@ impl ::prost::Name for QueryCodesRequest {
 #[derive(Clone, PartialEq, :: prost :: Message)]
 pub struct QueryCodesResponse {
     #[prost(message, repeated, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::vec::generic_serialize",
-        deserialize_with = "crate::any::vec::generic_deserialize"
-    )]
     pub code_infos: ::prost::alloc::vec::Vec<CodeInfoResponse>,
     #[doc = " pagination defines the pagination in the response."]
     #[prost(message, optional, tag = "2")]
@@ -1735,10 +1451,6 @@ impl ::prost::Name for QueryParamsRequest {
 pub struct QueryParamsResponse {
     #[doc = " params defines the parameters of the module."]
     #[prost(message, optional, tag = "1")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for QueryParamsResponse {
@@ -1802,10 +1514,6 @@ pub struct MsgStoreCode {
     #[doc = " InstantiatePermission access control to apply on contract creation,"]
     #[doc = " optional"]
     #[prost(message, optional, tag = "5")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
 }
 impl ::prost::Name for MsgStoreCode {
@@ -2104,10 +1812,6 @@ pub struct MsgUpdateInstantiateConfig {
     pub code_id: u64,
     #[doc = " NewInstantiatePermission is the new access control"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub new_instantiate_permission: ::core::option::Option<AccessConfig>,
 }
 impl ::prost::Name for MsgUpdateInstantiateConfig {
@@ -2143,10 +1847,6 @@ pub struct MsgUpdateParams {
     #[doc = ""]
     #[doc = " NOTE: All parameters must be supplied."]
     #[prost(message, optional, tag = "2")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub params: ::core::option::Option<Params>,
 }
 impl ::prost::Name for MsgUpdateParams {
@@ -2302,10 +2002,6 @@ pub struct MsgStoreAndInstantiateContract {
     pub wasm_byte_code: ::prost::alloc::vec::Vec<u8>,
     #[doc = " InstantiatePermission to apply on contract creation, optional"]
     #[prost(message, optional, tag = "4")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
     #[doc = " UnpinCode code on upload, optional. As default the uploaded contract is"]
     #[doc = " pinned to cache."]
@@ -2445,10 +2141,6 @@ pub struct MsgStoreAndMigrateContract {
     pub wasm_byte_code: ::prost::alloc::vec::Vec<u8>,
     #[doc = " InstantiatePermission to apply on contract creation, optional"]
     #[prost(message, optional, tag = "3")]
-    #[serde(
-        serialize_with = "crate::any::option::generic_serialize",
-        deserialize_with = "crate::any::option::generic_deserialize"
-    )]
     pub instantiate_permission: ::core::option::Option<AccessConfig>,
     #[doc = " Contract is the address of the smart contract"]
     #[prost(string, tag = "4")]
diff --git a/proto-build/src/parser.rs b/proto-build/src/parser.rs
deleted file mode 100644
index 760cafd..0000000
--- a/proto-build/src/parser.rs
+++ /dev/null
@@ -1,476 +0,0 @@
-use crate::patch_file;
-use glob::glob;
-use proc_macro2::Span;
-use quote::quote;
-use regex::Regex;
-use std::cmp::Ordering;
-use std::collections::BTreeMap;
-use std::fs;
-use std::path::PathBuf;
-use syn::punctuated::Punctuated;
-use syn::token::PathSep;
-use syn::{
-    AngleBracketedGenericArguments, Field, Fields, FieldsNamed, File, GenericArgument,
-    GenericParam, Ident, Item, ItemStruct, Path, PathArguments, PathSegment, TraitBound,
-    TraitBoundModifier, Type, TypeParam, TypeParamBound, TypePath,
-};
-
-fn as_struct(item: &mut Item) -> Option<&mut ItemStruct> {
-    match item {
-        Item::Struct(s) => Some(s),
-        _ => None,
-    }
-}
-
-fn as_path(item: &mut Type) -> Option<&mut TypePath> {
-    match item {
-        Type::Path(ret) => Some(ret),
-        _ => None,
-    }
-}
-
-fn as_named_fields(fields: &mut Fields) -> Option<&mut FieldsNamed> {
-    match fields {
-        Fields::Named(ret) => Some(ret),
-        _ => None,
-    }
-}
-
-enum FoundEnclosure {
-    Option,
-    Vec,
-}
-
-// The types we're going to be modifying only appear enclosed in Options and Vecs
-fn is_important(field: &mut Field) -> Option<(FoundEnclosure, &mut TypePath)> {
-    let path = as_path(&mut field.ty).unwrap();
-    // Get the last segment since the rest is a path
-    let field_type = path.path.segments.iter_mut().last().unwrap();
-
-    let field_type_ident = field_type.ident.to_string();
-    let found = if &field_type_ident == "Option" {
-        Some(FoundEnclosure::Option)
-    } else if &field_type_ident == "Vec" {
-        Some(FoundEnclosure::Vec)
-    } else {
-        None
-    };
-
-    // If we found the types we needed
-    if let Some(enclosed) = found {
-        if let PathArguments::AngleBracketed(bracket) = &mut field_type.arguments {
-            for p in bracket.args.iter_mut() {
-                if let GenericArgument::Type(t) = p {
-                    if let Some(any_path) = as_path(t) {
-                        return Some((enclosed, any_path));
-                    } else {
-                        println!("something else")
-                    }
-                }
-            }
-        }
-    }
-
-    None
-}
-
-// prost Message implements a generic B which was conflicting with this script
-const GENERICS: [&str; 10] = ["A", "BB", "C", "D", "E", "F", "G", "H", "I", "J"];
-
-fn gen_any(name: &str) -> Path {
-    let mut paths = create_punctuated(vec!["crate", "any"]);
-
-    let mut punctuation = Punctuated::new();
-    punctuation.push(GenericArgument::Type(Type::Path(TypePath {
-        qself: None,
-        path: gen_generic(name),
-    })));
-
-    paths.push(PathSegment {
-        ident: Ident::new("Any", Span::call_site()),
-        arguments: PathArguments::AngleBracketed(AngleBracketedGenericArguments {
-            colon2_token: None,
-            lt_token: Default::default(),
-            args: punctuation,
-            gt_token: Default::default(),
-        }),
-    });
-
-    Path {
-        leading_colon: None,
-        segments: paths,
-    }
-}
-
-/// Find any type of Any<GENERIC>
-fn contains_any_generic(segment: &PathSegment) -> bool {
-    if segment.ident == "Any" {
-        if let PathArguments::AngleBracketed(arguments) = &segment.arguments {
-            if let Some(GenericArgument::Type(Type::Path(type_path))) = arguments.args.last() {
-                return GENERICS.contains(
-                    &type_path
-                        .path
-                        .segments
-                        .last()
-                        .unwrap()
-                        .ident
-                        .to_string()
-                        .as_str(),
-                );
-            }
-        }
-    }
-
-    false
-}
-
-/// Function assumes we have a type Any already and want to update the generic
-fn replace_generic(segment: &mut PathSegment, name: &str) {
-    if let PathArguments::AngleBracketed(arguments) = &mut segment.arguments {
-        if let Some(GenericArgument::Type(Type::Path(type_path))) = arguments.args.last_mut() {
-            let last = type_path.path.segments.last_mut().unwrap();
-            last.ident = Ident::new(name, Span::call_site());
-        }
-    }
-}
-
-fn gen_generic(name: &str) -> Path {
-    Path {
-        leading_colon: None,
-        segments: create_punctuated(vec![name]),
-    }
-}
-
-fn create_punctuated(path: Vec<&str>) -> Punctuated<PathSegment, PathSep> {
-    let mut ret = Punctuated::new();
-    for p in path {
-        ret.push(PathSegment {
-            ident: Ident::new(p, Span::call_site()),
-            arguments: PathArguments::None,
-        });
-    }
-    ret
-}
-
-fn trait_param_bound(path: Vec<&str>) -> TypeParamBound {
-    TypeParamBound::Trait(TraitBound {
-        paren_token: None,
-        modifier: TraitBoundModifier::None,
-        lifetimes: None,
-        path: Path {
-            leading_colon: None,
-            segments: create_punctuated(path),
-        },
-    })
-}
-
-fn gen_unnamed_param(name: &str) -> TypeParam {
-    let mut type_param = TypeParam::from(Ident::new(name, Span::call_site()));
-    type_param.bounds.push(trait_param_bound(vec!["Clone"]));
-    type_param.bounds.push(trait_param_bound(vec!["PartialEq"]));
-    type_param.bounds.push(trait_param_bound(vec!["Default"]));
-    type_param.bounds.push(trait_param_bound(vec!["Send"]));
-    type_param.bounds.push(trait_param_bound(vec!["Sync"]));
-    type_param
-        .bounds
-        .push(trait_param_bound(vec!["prost", "Message"]));
-
-    type_param
-}
-
-pub fn generate_advanced_struct(out_dir: &str) -> crate::Result<()> {
-    println!("Loading and patching all files containing Any");
-    let mut project_tokens = load_and_patch_any(out_dir);
-    println!("Patching generic trait constraints");
-    patch_generics(&mut project_tokens);
-    println!("Patching prost Name impls");
-    patch_impls(&mut project_tokens);
-    println!("Saving changes");
-    save(out_dir, &project_tokens);
-
-    Ok(())
-}
-
-fn load_and_patch_any(out_dir: &str) -> BTreeMap<String, (File, BTreeMap<String, usize>)> {
-    // Map all file ASTs
-    let mut project_tokens = BTreeMap::new();
-
-    // Get all generated files
-    let src_files_glob = format!("{out_dir}/*.rs");
-    let src_files: Vec<PathBuf> = glob(src_files_glob.as_str()).unwrap().flatten().collect();
-
-    for src in src_files {
-        let current_file = fs::read_to_string(&src).unwrap();
-
-        let mut ast = syn::parse_file(&current_file).unwrap();
-
-        // Get all struct we might work with here
-        let mut structs = BTreeMap::new();
-
-        // First pass is just for replacing Any
-        // Also adds all the serde related information to serialize and deserialize into an appropriate structure
-        for (idx, item) in ast.items.iter_mut().enumerate() {
-            if let Some(item) = as_struct(item) {
-                // Find any fields and replace with generics
-                let fields = as_named_fields(&mut item.fields).unwrap();
-                for field in fields.named.iter_mut() {
-                    if let Some((_, path)) = is_important(field) {
-                        if path.path.segments.last().unwrap().ident == "Any" {
-                            // Set struct generics
-                            let generic = GENERICS[item.generics.params.len()];
-                            path.path = gen_any(generic);
-                            item.generics
-                                .params
-                                .push(GenericParam::Type(gen_unnamed_param(generic)));
-                        }
-                    }
-                }
-
-                // Add the struct reference to work on it later
-                structs.insert(item.ident.to_string(), idx);
-            }
-        }
-
-        // Remove the tonic include for now
-        if let Some(Item::Macro(_)) = ast.items.last() {
-            ast.items.pop();
-        }
-
-        let file_name = src.to_str().unwrap().split('/').last().unwrap();
-        project_tokens.insert(file_name.to_string(), (ast, structs));
-    }
-
-    project_tokens
-}
-
-fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize>)>) {
-    let mut updated_files = BTreeMap::new();
-    for key in files.keys().cloned() {
-        updated_files.insert(key, false);
-    }
-
-    loop {
-        // Go through all keys
-        // Pop current key to be able to use the tree map whenever
-        // Check for struct in local struct, if not found check in all of the map
-        // Push the struct back inside
-
-        let mut new_fixes = false;
-
-        let keys: Vec<String> = files.keys().cloned().collect();
-        for key in keys {
-            let (mut ast, structs) = files.remove(&key).unwrap();
-
-            let struct_idxs: Vec<usize> = structs.values().cloned().collect();
-
-            // Iterate through each struct, get their generic total
-            for idx in struct_idxs {
-                let (left, arr) = ast.items.split_at_mut(idx);
-                let (temp, right) = arr.split_at_mut(1);
-
-                let curr_struct = as_struct(temp.get_mut(0).unwrap()).unwrap();
-                let total_generics = curr_struct.generics.params.len();
-                let mut new_total_generics = 0;
-
-                // Iterate through each field and automatically update the fields and add to total field tally
-                for field in as_named_fields(&mut curr_struct.fields)
-                    .unwrap()
-                    .named
-                    .iter_mut()
-                {
-                    let name = field.ident.clone().unwrap().to_string();
-                    if let Some((_, path)) = is_important(field) {
-                        let ty = path.path.segments.last_mut().unwrap();
-
-                        let ident_name = ty.ident.to_string();
-
-                        fn push_generics(
-                            ty_struct: &ItemStruct,
-                            ty: &mut PathSegment,
-                            mut new_total_generics: usize,
-                        ) -> usize {
-                            let mut args = Punctuated::new();
-
-                            for _ in 0..ty_struct.generics.params.len() {
-                                args.push(GenericArgument::Type(Type::Path(TypePath {
-                                    qself: None,
-                                    path: gen_generic(GENERICS[new_total_generics]),
-                                })));
-                                new_total_generics += 1;
-                            }
-
-                            ty.arguments =
-                                PathArguments::AngleBracketed(AngleBracketedGenericArguments {
-                                    colon2_token: None,
-                                    lt_token: Default::default(),
-                                    args,
-                                    gt_token: Default::default(),
-                                });
-
-                            new_total_generics
-                        }
-
-                        // Generis state patch
-                        if ident_name == "GenesisState"
-                            && key == "ibc.core.types.v1.rs"
-                            && name == "client_genesis"
-                        {
-                            let (key, s) = files.get_mut("ibc.core.client.v1.rs").unwrap();
-                            let ty_struct = as_struct(
-                                key.items.get_mut(*s.get("GenesisState").unwrap()).unwrap(),
-                            )
-                                .unwrap();
-                            new_total_generics = push_generics(ty_struct, ty, new_total_generics);
-                        } else if let Some(i) = structs.get(&ident_name) {
-                            let ty_item = match i.cmp(&idx) {
-                                Ordering::Less => left.get_mut(*i).unwrap(),
-                                Ordering::Greater => right.get_mut(*i - idx - 1).unwrap(),
-                                Ordering::Equal => continue,
-                            };
-
-                            let ty_struct = as_struct(ty_item).unwrap();
-                            new_total_generics = push_generics(ty_struct, ty, new_total_generics);
-                        } else if contains_any_generic(ty) {
-                            replace_generic(ty, GENERICS[new_total_generics]);
-                            new_total_generics += 1;
-                        } else if let Some((_, (other_ast, other_structs))) = files
-                            .iter_mut()
-                            .find(|(_, (_, s))| s.contains_key(&ident_name))
-                        {
-                            let ty_struct = as_struct(
-                                other_ast
-                                    .items
-                                    .get_mut(*other_structs.get(&ident_name).unwrap())
-                                    .unwrap(),
-                            )
-                                .unwrap();
-                            new_total_generics = push_generics(ty_struct, ty, new_total_generics);
-                        }
-                    }
-                }
-
-                if new_total_generics > 0 {
-                    updated_files.insert(key.clone(), true);
-                }
-
-                if total_generics != new_total_generics {
-                    curr_struct.generics.params.clear();
-
-                    for gen in GENERICS[0..new_total_generics].iter() {
-                        curr_struct
-                            .generics
-                            .params
-                            .push(GenericParam::Type(gen_unnamed_param(gen)));
-                    }
-                    new_fixes = true;
-                }
-            }
-
-            files.insert(key, (ast, structs));
-        }
-
-        if !new_fixes {
-            break;
-        }
-    }
-
-    // Remove files that werent updated
-    for (key, updated) in updated_files.iter() {
-        if !updated {
-            files.remove(key);
-        }
-    }
-}
-
-fn patch_impls(files: &mut BTreeMap<String, (File, BTreeMap<String, usize>)>) {
-    for (_, (ast, structs)) in files.iter_mut() {
-        // Fix the Name implementations
-        // Since we are borrowing from the same array, we need to split the list to use it
-        for i in 1..ast.items.len() {
-            let (left, right) = ast.items.split_at_mut(i);
-            let item = right.get_mut(0).unwrap();
-            if let Item::Impl(impl_item) = item {
-                // Ignore if its not the Name impl
-                if let Some(t) = impl_item.trait_.clone() {
-                    if t.1.segments.last().unwrap().ident != "Name" {
-                        continue;
-                    }
-                }
-
-                // Get the struct that is getting an impl
-                let implemented = as_path(impl_item.self_ty.as_mut())
-                    .map(|p| p.path.segments.last().unwrap().ident.to_string())
-                    .unwrap_or("".to_string());
-
-                let idx = match structs.get(&implemented) {
-                    // If its not a struct then ignore
-                    None => continue,
-                    Some(idx) => *idx,
-                };
-                // Unwrap cause we know its a struct
-                let struct_item = as_struct(left.get_mut(idx).unwrap()).unwrap();
-                // Ignore structs with no generics
-                if struct_item.generics.params.is_empty() {
-                    continue;
-                }
-
-                impl_item.generics = struct_item.generics.clone();
-
-                if let Some(impl_path) = as_path(impl_item.self_ty.as_mut()) {
-                    let mut args = Punctuated::new();
-
-                    for gen in GENERICS[0..impl_item.generics.params.len()].iter() {
-                        args.push(GenericArgument::Type(Type::Path(TypePath {
-                            qself: None,
-                            path: gen_generic(gen),
-                        })));
-                    }
-
-                    let seg = impl_path.path.segments.last_mut().unwrap();
-
-                    seg.arguments = PathArguments::AngleBracketed(AngleBracketedGenericArguments {
-                        colon2_token: None,
-                        lt_token: Default::default(),
-                        args,
-                        gt_token: Default::default(),
-                    });
-                }
-            }
-        }
-    }
-}
-
-fn save(out_dir: &str, files: &BTreeMap<String, (File, BTreeMap<String, usize>)>) {
-    for (file, (data, _)) in files.iter() {
-        // Patch the mod file
-        let file_regex = Regex::new(r"(\.[[:alnum:]]+\.)rs").unwrap();
-        let new_file = file_regex.replace(file, "${1}abstract.rs").to_string();
-
-        patch_file(
-            format!("{}/mod.rs", out_dir),
-            &[(
-                &format!(
-                    r"include!\(.{}.\);",
-                    Regex::new(r"(\.)").unwrap().replace(file, r"\.")
-                ),
-                &format!(
-                    "\
-                #[cfg(not(feature = \"abstract-any\"))]\n\
-                include!(\"{}\");\n\
-                #[cfg(feature = \"abstract-any\")]\n\
-                include!(\"{}\");\
-                ",
-                    file, new_file
-                ),
-            )],
-        )
-            .unwrap();
-
-        // Export the generated structure and save in file
-        fs::write(
-            format!("{}/{}", out_dir, new_file),
-            quote!(#data).to_string(),
-        )
-            .unwrap();
-    }
-}
diff --git a/proto-build/src/parser/commands/load_and_patch_any.rs b/proto-build/src/parser/commands/load_and_patch_any.rs
index 93d8b40..d4ddc1f 100644
--- a/proto-build/src/parser/commands/load_and_patch_any.rs
+++ b/proto-build/src/parser/commands/load_and_patch_any.rs
@@ -1,17 +1,12 @@
 use crate::parser::consts::GENERICS;
-use crate::parser::utils::common::{
-    create_punctuated, fields_as_named, gen_generic, item_as_struct,
-};
-use crate::parser::utils::gen_type_param::gen_type_param;
-use crate::parser::utils::is_important::{is_important, FoundEnclosure};
+use crate::parser::utils::common::{fields_as_named, item_as_struct};
+use crate::parser::utils::gen_type_param::{gen_any, gen_type_param};
+use crate::parser::utils::is_important::is_important;
 use glob::glob;
-use proc_macro2::{Ident, Literal, Punct, Spacing, Span, TokenStream};
-use quote::TokenStreamExt;
 use std::collections::BTreeMap;
 use std::fs;
 use std::path::{Path, PathBuf};
-use syn::token::Paren;
-use syn::{AttrStyle, Attribute, File, GenericParam, Item, MacroDelimiter, Meta, MetaList};
+use syn::{File, GenericParam, Item};
 
 pub fn load_and_patch_any(out_dir: &Path) -> BTreeMap<String, (File, BTreeMap<String, usize>)> {
     // Map all file ASTs
@@ -27,11 +22,6 @@ pub fn load_and_patch_any(out_dir: &Path) -> BTreeMap<String, (File, BTreeMap<St
     for src in src_files {
         let current_file = fs::read_to_string(&src).unwrap();
 
-        // // Filter files that don't have `Any`
-        // if !any_filter.is_match(&current_file) {
-        //     continue;
-        // }
-
         let mut ast = syn::parse_file(&current_file).unwrap();
 
         // Get all struct we might work with here
@@ -44,49 +34,14 @@ pub fn load_and_patch_any(out_dir: &Path) -> BTreeMap<String, (File, BTreeMap<St
                 // Find any fields and replace with generics
                 let fields = fields_as_named(&mut item.fields).unwrap();
                 for field in fields.named.iter_mut() {
-                    if let Some((ty, path)) = is_important(field) {
+                    if let Some((_, path)) = is_important(field) {
                         if path.path.segments.last().unwrap().ident == "Any" {
                             // Set struct generics
                             let generic = GENERICS[item.generics.params.len()];
-                            path.path = gen_generic(generic);
+                            path.path = gen_any(generic);
                             item.generics
                                 .params
                                 .push(GenericParam::Type(gen_type_param(generic)));
-
-                            // Set serialization function
-                            let serde_path = match ty {
-                                FoundEnclosure::Option => "option",
-                                FoundEnclosure::Vec => "vec",
-                            };
-
-                            let mut token_stream = TokenStream::new();
-                            token_stream.append(Ident::new("serialize_with", Span::call_site()));
-                            token_stream.append(Punct::new('=', Spacing::Alone));
-                            token_stream.append(Literal::string(&format!(
-                                "crate::any::{}::serialize",
-                                serde_path
-                            )));
-                            token_stream.append(Punct::new(',', Spacing::Alone));
-                            token_stream.append(Ident::new("deserialize_with", Span::call_site()));
-                            token_stream.append(Punct::new('=', Spacing::Alone));
-                            token_stream.append(Literal::string(&format!(
-                                "crate::any::{}::deserialize",
-                                serde_path
-                            )));
-
-                            field.attrs.push(Attribute {
-                                pound_token: Default::default(),
-                                style: AttrStyle::Outer,
-                                bracket_token: Default::default(),
-                                meta: Meta::List(MetaList {
-                                    path: syn::Path {
-                                        leading_colon: None,
-                                        segments: create_punctuated(vec!["serde"]),
-                                    },
-                                    delimiter: MacroDelimiter::Paren(Paren::default()),
-                                    tokens: token_stream,
-                                }),
-                            });
                         }
                     }
                 }
diff --git a/proto-build/src/parser/commands/patch_generics.rs b/proto-build/src/parser/commands/patch_generics.rs
index edc0a14..ff15572 100644
--- a/proto-build/src/parser/commands/patch_generics.rs
+++ b/proto-build/src/parser/commands/patch_generics.rs
@@ -1,18 +1,14 @@
 use crate::parser::consts::GENERICS;
-use crate::parser::utils::common::{
-    create_punctuated, fields_as_named, gen_generic, item_as_struct,
-};
+use crate::parser::utils::common::{fields_as_named, gen_generic, item_as_struct};
 use crate::parser::utils::gen_type_param::gen_type_param;
-use crate::parser::utils::is_important::{is_important, FoundEnclosure};
-use proc_macro2::{Ident, Literal, Punct, Spacing, Span, TokenStream};
-use quote::TokenStreamExt;
+use crate::parser::utils::is_important::is_important;
+use proc_macro2::{Ident, Span};
 use std::cmp::Ordering;
 use std::collections::BTreeMap;
 use syn::punctuated::Punctuated;
-use syn::token::Paren;
 use syn::{
-    AngleBracketedGenericArguments, AttrStyle, Attribute, File, GenericArgument, GenericParam,
-    ItemStruct, MacroDelimiter, Meta, MetaList, Path, PathArguments, PathSegment, Type, TypePath,
+    AngleBracketedGenericArguments, File, GenericArgument, GenericParam, ItemStruct, PathArguments,
+    PathSegment, Type, TypePath,
 };
 
 pub fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize>)>) {
@@ -24,7 +20,7 @@ pub fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize
     loop {
         // Go through all keys
         // Pop current key to be able to use the tree map whenever
-        // Check for struct in local struct, if not found check in `all` of the map
+        // Check for struct in local struct, if not found check in all of the map
         // Push the struct back inside
 
         let mut new_fixes = false;
@@ -51,8 +47,7 @@ pub fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize
                     .iter_mut()
                 {
                     let name = field.ident.clone().unwrap().to_string();
-                    let mut found_ty = None;
-                    if let Some((field_ty, path)) = is_important(field) {
+                    if let Some((_, path)) = is_important(field) {
                         let ty = path.path.segments.last_mut().unwrap();
 
                         let ident_name = ty.ident.to_string();
@@ -93,7 +88,6 @@ pub fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize
                                 key.items.get_mut(*s.get("GenesisState").unwrap()).unwrap(),
                             )
                             .unwrap();
-                            found_ty = Some(field_ty);
                             new_total_generics = push_generics(ty_struct, ty, new_total_generics);
                         } else if let Some(i) = structs.get(&ident_name) {
                             let ty_item = match i.cmp(&idx) {
@@ -103,10 +97,9 @@ pub fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize
                             };
 
                             let ty_struct = item_as_struct(ty_item).unwrap();
-                            found_ty = Some(field_ty);
                             new_total_generics = push_generics(ty_struct, ty, new_total_generics);
-                        } else if GENERICS.contains(&&*ident_name) {
-                            ty.ident = Ident::new(GENERICS[new_total_generics], Span::call_site());
+                        } else if contains_any_generic(ty) {
+                            replace_generic(ty, GENERICS[new_total_generics]);
                             new_total_generics += 1;
                         } else if let Some((_, (other_ast, other_structs))) = files
                             .iter_mut()
@@ -119,55 +112,9 @@ pub fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize
                                     .unwrap(),
                             )
                             .unwrap();
-                            found_ty = Some(field_ty);
                             new_total_generics = push_generics(ty_struct, ty, new_total_generics);
                         }
                     }
-
-                    // Try to add field attrs
-                    if let Some(found_ty) = found_ty {
-                        let last = field.attrs.last().unwrap().clone();
-                        if let Meta::List(meta_list) = &last.meta {
-                            if meta_list.path.segments.last().unwrap().ident != "serde" {
-                                // Set serialization function
-                                let serde_path = match found_ty {
-                                    FoundEnclosure::Option => "option",
-                                    FoundEnclosure::Vec => "vec",
-                                };
-
-                                let mut token_stream = TokenStream::new();
-                                token_stream
-                                    .append(Ident::new("serialize_with", Span::call_site()));
-                                token_stream.append(Punct::new('=', Spacing::Alone));
-                                token_stream.append(Literal::string(&format!(
-                                    "crate::any::{}::generic_serialize",
-                                    serde_path
-                                )));
-                                token_stream.append(Punct::new(',', Spacing::Alone));
-                                token_stream
-                                    .append(Ident::new("deserialize_with", Span::call_site()));
-                                token_stream.append(Punct::new('=', Spacing::Alone));
-                                token_stream.append(Literal::string(&format!(
-                                    "crate::any::{}::generic_deserialize",
-                                    serde_path
-                                )));
-
-                                field.attrs.push(Attribute {
-                                    pound_token: Default::default(),
-                                    style: AttrStyle::Outer,
-                                    bracket_token: Default::default(),
-                                    meta: Meta::List(MetaList {
-                                        path: Path {
-                                            leading_colon: None,
-                                            segments: create_punctuated(vec!["serde"]),
-                                        },
-                                        delimiter: MacroDelimiter::Paren(Paren::default()),
-                                        tokens: token_stream,
-                                    }),
-                                });
-                            }
-                        }
-                    }
                 }
 
                 if new_total_generics > 0 {
@@ -202,3 +149,35 @@ pub fn patch_generics(files: &mut BTreeMap<String, (File, BTreeMap<String, usize
         }
     }
 }
+
+/// Find any type of Any<GENERIC>
+fn contains_any_generic(segment: &PathSegment) -> bool {
+    if segment.ident == "Any" {
+        if let PathArguments::AngleBracketed(arguments) = &segment.arguments {
+            if let Some(GenericArgument::Type(Type::Path(type_path))) = arguments.args.last() {
+                return GENERICS.contains(
+                    &type_path
+                        .path
+                        .segments
+                        .last()
+                        .unwrap()
+                        .ident
+                        .to_string()
+                        .as_str(),
+                );
+            }
+        }
+    }
+
+    false
+}
+
+/// Function assumes we have a type Any already and want to update the generic
+fn replace_generic(segment: &mut PathSegment, name: &str) {
+    if let PathArguments::AngleBracketed(arguments) = &mut segment.arguments {
+        if let Some(GenericArgument::Type(Type::Path(type_path))) = arguments.args.last_mut() {
+            let last = type_path.path.segments.last_mut().unwrap();
+            last.ident = Ident::new(name, Span::call_site());
+        }
+    }
+}
diff --git a/proto-build/src/parser/utils/gen_type_param.rs b/proto-build/src/parser/utils/gen_type_param.rs
index a82f855..ee47ab3 100644
--- a/proto-build/src/parser/utils/gen_type_param.rs
+++ b/proto-build/src/parser/utils/gen_type_param.rs
@@ -1,6 +1,10 @@
-use crate::parser::utils::common::create_punctuated;
+use crate::parser::utils::common::{create_punctuated, gen_generic};
 use proc_macro2::{Ident, Span};
-use syn::{Path, TraitBound, TraitBoundModifier, TypeParam, TypeParamBound};
+use syn::punctuated::Punctuated;
+use syn::{
+    AngleBracketedGenericArguments, GenericArgument, Path, PathArguments, PathSegment, TraitBound,
+    TraitBoundModifier, Type, TypeParam, TypeParamBound, TypePath,
+};
 
 fn trait_param_bound(path: Vec<&str>) -> TypeParamBound {
     TypeParamBound::Trait(TraitBound {
@@ -24,12 +28,6 @@ fn gen_unnamed_param(name: &str) -> TypeParam {
     type_param
         .bounds
         .push(trait_param_bound(vec!["prost", "Message"]));
-    type_param
-        .bounds
-        .push(trait_param_bound(vec!["serde", "Serialize"]));
-    type_param
-        .bounds
-        .push(trait_param_bound(vec!["serde", "de", "DeserializeOwned"]));
 
     type_param
 }
@@ -41,3 +39,28 @@ pub fn gen_type_param(name: &str) -> TypeParam {
         .push(trait_param_bound(vec!["prost", "Name"]));
     type_param
 }
+
+pub fn gen_any(name: &str) -> Path {
+    let mut paths = create_punctuated(vec!["crate", "any"]);
+
+    let mut punctuation = Punctuated::new();
+    punctuation.push(GenericArgument::Type(Type::Path(TypePath {
+        qself: None,
+        path: gen_generic(name),
+    })));
+
+    paths.push(PathSegment {
+        ident: Ident::new("Any", Span::call_site()),
+        arguments: PathArguments::AngleBracketed(AngleBracketedGenericArguments {
+            colon2_token: None,
+            lt_token: Default::default(),
+            args: punctuation,
+            gt_token: Default::default(),
+        }),
+    });
+
+    Path {
+        leading_colon: None,
+        segments: paths,
+    }
+}
diff --git a/proto-build/src/parser/utils/mod.rs b/proto-build/src/parser/utils/mod.rs
index 2b2b2c7..21bb240 100644
--- a/proto-build/src/parser/utils/mod.rs
+++ b/proto-build/src/parser/utils/mod.rs
@@ -1,3 +1,4 @@
 pub mod common;
 pub mod gen_type_param;
 pub mod is_important;
+

From ba5003bad0005b968531b9142b4d619426ac5226 Mon Sep 17 00:00:00 2001
From: Guy Garcia <guy.garcia@protonmail.com>
Date: Mon, 4 Nov 2024 16:49:47 -0400
Subject: [PATCH 7/7] formatting

---
 packages/proto/src/any.rs           | 20 ++++++++++----------
 proto-build/src/parser/utils/mod.rs |  1 -
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/proto/src/any.rs b/packages/proto/src/any.rs
index 7dfcac8..736b6a6 100644
--- a/packages/proto/src/any.rs
+++ b/packages/proto/src/any.rs
@@ -178,16 +178,16 @@ mod test {
     }
 
     impl<
-        A: Default
-        + Message
-        + Name
-        + Send
-        + Sync
-        + Serialize
-        + DeserializeOwned
-        + PartialEq
-        + Clone,
-    > Name for ExternalStructTest<A>
+            A: Default
+                + Message
+                + Name
+                + Send
+                + Sync
+                + Serialize
+                + DeserializeOwned
+                + PartialEq
+                + Clone,
+        > Name for ExternalStructTest<A>
     {
         const NAME: &'static str = "AnyValue";
         const PACKAGE: &'static str = "test";
diff --git a/proto-build/src/parser/utils/mod.rs b/proto-build/src/parser/utils/mod.rs
index 21bb240..2b2b2c7 100644
--- a/proto-build/src/parser/utils/mod.rs
+++ b/proto-build/src/parser/utils/mod.rs
@@ -1,4 +1,3 @@
 pub mod common;
 pub mod gen_type_param;
 pub mod is_important;
-