feat: add tonic plugin to provenance buf config so grpc client/servers are generated - guarded by grpc and grpc-transport features

packages/proto-build/Cargo.toml

@@ -20,6 +20,4 @@ prost-types = { workspace = true }
 quote = "1.0.26"
 regex = "1"
 syn = { version = "1.0.109", features = ["full", "parsing", "extra-traits"] }
-tonic = "0.7"
-tonic-build = "0.7"
-walkdir = "2"
+walkdir = "2"

packages/proto-build/provenance.buf.gen.yaml

@@ -5,4 +5,10 @@ plugins:
     opt:
       - extern_path=.google.protobuf.Timestamp=crate::shim::Timestamp
       - extern_path=.google.protobuf.Duration=crate::shim::Duration
-      - extern_path=.google.protobuf.Any=crate::shim::Any
+      - extern_path=.google.protobuf.Any=crate::shim::Any
+  - plugin: buf.build/community/neoeinstein-tonic
+    out: .
+    opt:
+      - extern_path=.google.protobuf.Timestamp=crate::shim::Timestamp
+      - extern_path=.google.protobuf.Duration=crate::shim::Duration
+      - extern_path=.google.protobuf.Any=crate::shim::Any

packages/proto-build/src/transform.rs

@@ -17,9 +17,11 @@ use crate::transformers;
 const EXCLUDED_PROTO_PACKAGES: &[&str] = &["amino", "cosmos_proto", "gogoproto", "google"];
 
 /// These structures are excluded from the final module
+/// matched against using String::contains(...)
 const EXCLUDED_STRUCTURES: &[&str] = &[
     "provenance::msgfees::v1::CalculateTxFeesRequest",
     "provenance::msgfees::v1::CalculateTxFeesResponse",
+    "::tonic::",
 ];
 
 pub fn copy_and_transform_all(from_dir: &Path, to_dir: &Path, descriptor: &FileDescriptorSet) {
@@ -153,8 +155,10 @@ fn transform_items(
                         _ => s.ident.to_string(),
                     };
 
-                    if EXCLUDED_STRUCTURES.contains(&full_path.as_str()) {
-                        return None;
+                    for exclude in EXCLUDED_STRUCTURES {
+                        if full_path.contains(exclude) {
+                            return None;
+                        }
                     }
                     let s = transformers::add_derive_eq_struct(&s);
                     let s = transformers::append_attrs_struct(src, &s, descriptor);

packages/provwasm-std/src/types/cosmos/app/mod.rs

@@ -1,2 +1,2 @@
-pub mod runtime;
+pub mod module;
 pub mod v1alpha1;

packages/provwasm-std/src/types/cosmos/authz/module/v1.rs → packages/provwasm-std/src/types/cosmos/app/module/v1alpha1.rs

@@ -1,5 +1,5 @@
 use provwasm_proc_macro::{CosmwasmExt, SerdeEnumAsInt};
-/// Module is the config object of the authz module.
+/// Module is the module config object for the cosmos.app v1 app module.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
     Clone,
@@ -11,5 +11,5 @@ use provwasm_proc_macro::{CosmwasmExt, SerdeEnumAsInt};
     ::schemars::JsonSchema,
     CosmwasmExt,
 )]
-#[proto_message(type_url = "/cosmos.authz.module.v1.Module")]
+#[proto_message(type_url = "/cosmos.app.module.v1alpha1.Module")]
 pub struct Module {}

packages/provwasm-std/src/types/cosmos/app/v1alpha1.rs

@@ -65,7 +65,7 @@ pub struct PackageReference {
     ///
     /// When a new version of a module is released and items are added to existing
     /// .proto files, these definitions should contain comments of the form
-    /// "Since: Revision N" where N is an integer revision.
+    /// "Since Revision N" where N is an integer revision.
     ///
     /// When the module runtime starts up, it will check the pinned proto
     /// image and panic if there are runtime protobuf definitions that are not
@@ -132,11 +132,6 @@ pub struct Config {
     /// modules are the module configurations for the app.
     #[prost(message, repeated, tag = "1")]
     pub modules: ::prost::alloc::vec::Vec<ModuleConfig>,
-    /// golang_bindings specifies explicit interface to implementation type bindings which
-    /// depinject uses to resolve interface inputs to provider functions.  The scope of this
-    /// field's configuration is global (not module specific).
-    #[prost(message, repeated, tag = "2")]
-    pub golang_bindings: ::prost::alloc::vec::Vec<GolangBinding>,
 }
 /// ModuleConfig is a module configuration for an app.
 #[allow(clippy::derive_partial_eq_without_eq)]
@@ -168,32 +163,6 @@ pub struct ModuleConfig {
     /// define a ModuleDescriptor using the cosmos.app.v1alpha1.is_module extension.
     #[prost(message, optional, tag = "2")]
     pub config: ::core::option::Option<crate::shim::Any>,
-    /// golang_bindings specifies explicit interface to implementation type bindings which
-    /// depinject uses to resolve interface inputs to provider functions.  The scope of this
-    /// field's configuration is module specific.
-    #[prost(message, repeated, tag = "3")]
-    pub golang_bindings: ::prost::alloc::vec::Vec<GolangBinding>,
-}
-/// GolangBinding is an explicit interface type to implementing type binding for dependency injection.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ::prost::Message,
-    ::serde::Serialize,
-    ::serde::Deserialize,
-    ::schemars::JsonSchema,
-    CosmwasmExt,
-)]
-#[proto_message(type_url = "/cosmos.app.v1alpha1.GolangBinding")]
-pub struct GolangBinding {
-    /// interface_type is the interface type which will be bound to a specific implementation type
-    #[prost(string, tag = "1")]
-    pub interface_type: ::prost::alloc::string::String,
-    /// implementation is the implementing type which will be supplied when an input of type interface is requested
-    #[prost(string, tag = "2")]
-    pub implementation: ::prost::alloc::string::String,
 }
 /// QueryConfigRequest is the Query/Config request type.
 #[allow(clippy::derive_partial_eq_without_eq)]

packages/provwasm-std/src/types/cosmos/auth/mod.rs

@@ -1,2 +1 @@
-pub mod module;
 pub mod v1beta1;