WASM support with grpc-web

.github/workflows/cosmos-sdk-proto.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.51.0 # MSRV
+          - 1.56.0 # MSRV
           - stable
         target:
           - x86_64-unknown-linux-gnu
@@ -42,7 +42,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.51.0 # MSRV
+          - 1.56.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v1

.github/workflows/cosmos-sdk-rs.yml → .github/workflows/cosmrs.yml

@@ -1,17 +1,17 @@
-name: cosmos-sdk-rs
+name: cosmrs
 
 on:
   push:
     branches: main
   pull_request:
     paths:
       - "cosmos-sdk-proto/**"
-      - "cosmos-sdk-rs/**"
+      - "cosmrs/**"
       - "Cargo.*"
 
 defaults:
   run:
-    working-directory: cosmos-sdk-rs
+    working-directory: cosmrs
 
 env:
   CARGO_TERM_COLOR: always
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.51.0 # MSRV
+          - 1.56.0 # MSRV
           - stable
         target:
           - x86_64-unknown-linux-gnu
@@ -43,7 +43,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.51.0 # MSRV
+          - 1.56.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v1

.github/workflows/rebuild-protos.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.51.0 # MSRV
+          toolchain: 1.56.0 # MSRV
           components: rustfmt
           override: true
           profile: minimal

.github/workflows/workspace.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.51.0 # MSRV
+          toolchain: 1.56.0 # MSRV
           components: rustfmt
           override: true
           profile: minimal
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.51.0 # MSRV
+          toolchain: 1.56.0 # MSRV
           components: clippy
           override: true
           profile: minimal

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "cosmos-sdk"]
 	path = cosmos-sdk-go
 	url = https://github.com/cosmos/cosmos-sdk.git
+[submodule "wasmd"]
+	path = wasmd
+	url = https://github.com/CosmWasm/wasmd.git
+[submodule "ibc-go"]
+	path = ibc-go
+	url = https://github.com/cosmos/ibc-go

Cargo.toml

@@ -3,5 +3,5 @@ resolver = "2"
 members = [
     "proto-build",
     "cosmos-sdk-proto",
-    "cosmos-sdk-rs"
+    "cosmrs"
 ]

README.md

@@ -6,8 +6,8 @@ This is a place for commonly shared rust resources related to the Cosmos ecosyst
 
 | Name                 | Description                 | crates.io | docs.rs | CI Build |
 |----------------------|-----------------------------|-----------|---------|----------|
-| [`cosmos‑sdk`]       | Cosmos SDK for Rust         | [![crates.io][cosmos-sdk-crate-img]][cosmos-sdk-crate-link] | [![docs.rs][cosmos-sdk-docs-img]][cosmos-sdk-docs-link] | [![CI][cosmos-sdk-ci-img]][cosmos-sdk-ci-link] |
-| [`cosmos‑sdk‑proto`] | Proto and gRPC definitions  | [![crates.io][cosmos-sdk-proto-crate-img]][cosmos-sdk-crate-link] | ![docs.rs][cosmos-sdk-proto-docs-img] | [![CI][cosmos-sdk-proto-ci-img]][cosmos-sdk-proto-ci-link] |
+| [`cosmrs`]           | Cosmos SDK for Rust         | [![crates.io][cosmrs-crate-img]][cosmrs-crate-link] | [![docs.rs][cosmrs-docs-img]][cosmrs-docs-link] | [![CI][cosmrs-ci-img]][cosmrs-ci-link] |
+| [`cosmos‑sdk‑proto`] | Proto and gRPC definitions  | [![crates.io][cosmos-sdk-proto-crate-img]][cosmrs-crate-link] | ![docs.rs][cosmos-sdk-proto-docs-img] | [![CI][cosmos-sdk-proto-ci-img]][cosmos-sdk-proto-ci-link] |
 
 ## Merge Policy
 
@@ -34,24 +34,24 @@ all other crates, simply make the required edits in [main.rs](proto-build/main.r
 
 ## Minimum Supported Rust Version
 
-Rust **1.48**
+Rust **1.56**
 
 [//]: # "crates"
 
-[`cosmos‑sdk`]: https://github.com/cosmos/cosmos-rust/tree/main/cosmos-sdk-rs
+[`cosmrs`]: https://github.com/cosmos/cosmos-rust/tree/main/cosmrs
 [`cosmos‑sdk‑proto`]: https://github.com/cosmos/cosmos-rust/tree/main/cosmos-sdk-proto
 
 [//]: # "badges"
 
-[cosmos-sdk-crate-img]: https://img.shields.io/crates/v/cosmos_sdk.svg?logo=rust
-[cosmos-sdk-crate-link]: https://crates.io/crates/cosmos_sdk
-[cosmos-sdk-docs-img]: https://docs.rs/cosmos_sdk/badge.svg
-[cosmos-sdk-docs-link]: https://docs.rs/cosmos_sdk/
-[cosmos-sdk-ci-img]: https://github.com/cosmos/cosmos-rust/workflows/cosmos-sdk-rs/badge.svg
-[cosmos-sdk-ci-link]: https://github.com/cosmos/cosmos-rust/actions/workflows/cosmos-sdk-rs.yml
+[cosmrs-crate-img]: https://img.shields.io/crates/v/cosmrs.svg?logo=rust
+[cosmrs-crate-link]: https://crates.io/crates/cosmrs
+[cosmrs-docs-img]: https://docs.rs/cosmrs/badge.svg
+[cosmrs-docs-link]: https://docs.rs/cosmrs/
+[cosmrs-ci-img]: https://github.com/cosmos/cosmos-rust/workflows/cosmrs/badge.svg
+[cosmrs-ci-link]: https://github.com/cosmos/cosmos-rust/actions/workflows/cosmrs.yml
 
 [cosmos-sdk-proto-crate-img]: https://img.shields.io/crates/v/cosmos-sdk-proto.svg?logo=rust
-[cosmos-sdk-crate-link]: https://crates.io/crates/cosmos-sdk-proto
+[cosmrs-crate-link]: https://crates.io/crates/cosmos-sdk-proto
 [cosmos-sdk-proto-docs-img]: https://docs.rs/cosmos-sdk-proto/badge.svg
 [cosmos-sdk-proto-docs-link]: https://docs.rs/cosmos-sdk-proto/
 [cosmos-sdk-proto-ci-img]: https://github.com/cosmos/cosmos-rust/workflows/cosmos-sdk-proto/badge.svg

cosmos-sdk-proto/CHANGELOG.md

@@ -5,20 +5,62 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 0.5.0 (2021-04-10)
+## 0.8.0 (2021-10-28)
+### Changed
+- Update to cosmos-sdk v0.44.1 and ibc-go v1.2.0 ([#138])
+- Bump tendermint-rs crates to v0.23; MSRV 1.56 ([#144])
+- 2021 edition upgrade ([#148])
+
+[#138]: https://github.com/cosmos/cosmos-rust/pull/138
+[#144]: https://github.com/cosmos/cosmos-rust/pull/144
+[#148]: https://github.com/cosmos/cosmos-rust/pull/148
+
+## 0.7.0 (2021-09-27)
+### Changed
+- Update `tendermint-proto` crate to v0.22 ([#128])
+- Bump `COSMOS_REV` to v0.44.0 ([#130])
+
+[#128]: https://github.com/cosmos/cosmos-rust/pull/128
+[#130]: https://github.com/cosmos/cosmos-rust/pull/130
+
+## 0.6.3 (2021-08-24)
+### Changed
+- Bump MSRV to 1.54 ([#122])
+
+[#122]: https://github.com/cosmos/cosmos-rust/pull/122
+
+## 0.6.2 (2021-08-24)
+### Added
+- Protos for vesting accounts ([#119])
 
+[#119]: https://github.com/cosmos/cosmos-rust/pull/119
+
+## 0.6.1 (2021-08-19)
 ### Changed
+- Rebuild protos with cosmos-sdk v0.43.0  ([#117])
+
+[#117]: https://github.com/cosmos/cosmos-rust/pull/117
 
+## 0.6.0 (2021-08-02) [YANKED]
+### Added
+- Basic `cosmwasm` support ([#96])
+
+### Changed
+- Bump `tendermint-proto` requirement from 0.20 to 0.21 ([#106])
+
+[#96]: https://github.com/cosmos/cosmos-rust/pull/96
+[#106]: https://github.com/cosmos/cosmos-rust/pull/106
+
+## 0.5.0 (2021-04-10)
+### Changed
 - Add support for crypto proto and services ([#73])
-- Update tendermint crate ([#72])
+- Update `tendermint` crate ([#72])
 
 [#72]: https://github.com/cosmos/cosmos-rust/pull/72
 [#73]: https://github.com/cosmos/cosmos-rust/pull/73
 
 ## 0.4.0 (2021-04-02)
-
 ### Changed
-
 - Add support for bank proto and services ([#61])
 - Add support for tendermint proto and services ([#57])
 - Add support for bank, crisis, distribution, evidence, genutil, gov, mint, params, slashing, staking upgrade and vesting proto and services ([#64])
@@ -29,9 +71,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#61]: https://github.com/cosmos/cosmos-rust/pull/64
 
 ## 0.3.0 (2020-02-01)
-
 ### Changed
-
 - Bump `cosmos-sdk` rev to v0.40.0 ([#37])
 - Bump `tendermint` crate dependency to v0.18 ([#45])
 - Bump `prost`, `prost-types`, `prost-build` to v0.7 ([#45])
@@ -43,13 +83,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#45]: https://github.com/cosmos/cosmos-rust/pull/45
 
 ## 0.2.0 (2020-01-04)
-
 ### Added
-
 - `grpc` crate feature ([#8])
 
 ### Changed
-
 - Bump `cosmos-sdk` rev to v0.40.0-rc6 ([#32])
 - Bump `tendermint` + `tendermint-proto` crate dependencies to v0.17 ([#18])
 - Format `prost`/`tonic` output with `rustfmt` ([#17])

cosmos-sdk-proto/Cargo.toml

@@ -1,32 +1,32 @@
 [package]
 name = "cosmos-sdk-proto"
-version = "0.5.0" # Also update html_root_url in lib.rs when bumping this
+version = "0.8.0" # Also update html_root_url in lib.rs when bumping this
 authors = [
     "Justin Kilpatrick <[email protected]>",
     "Greg Szabo <[email protected]>",
     "Tony Arcieri <[email protected]>"
 ]
-edition = "2018"
 license = "Apache-2.0"
 repository = "https://github.com/cosmos/cosmos-rust/tree/main/cosmos-sdk-proto"
 description = "Protobuf stuct defintions for interacting Cosmos SDK powered blockchains"
-readme     = "README.md"
+readme = "README.md"
 categories = ["cryptography", "cryptography::cryptocurrencies", "database"]
-keywords   = ["blockchain", "cosmos", "tendermint", "proto"]
+keywords = ["blockchain", "cosmos", "tendermint", "proto"]
+edition = "2021"
+rust-version = "1.56"
 
 [dependencies]
-prost = "0.7"
-prost-types = "0.7"
+prost = "0.9"
+prost-types = "0.9"
+tendermint-proto = "0.23"
 
 # Optional dependencies
-tonic = { version = "0.4", optional = true }
-
-[dependencies.tendermint-proto]
-version = "0.20"
+tonic = { version = "0.6", optional = true, default-features = false, features = ["codegen", "prost"] }
 
 [features]
 default = ["grpc"]
 grpc = ["tonic"]
+cosmwasm = []
 
 [package.metadata.docs.rs]
 all-features = true

cosmos-sdk-proto/README.md

@@ -11,16 +11,16 @@ Rust crate for interacting with [Protobufs] defined by the [Cosmos SDK].
 The goal of this crate is to provide complete proto struct definitions for interacting
 with a Cosmos SDK blockchain.
 
-Currently this crate only provides a minority of the many total structs exported by
-proto files.
+Currently, this crate only provides a subset of the many total structs exported by
+Cosmos SDK proto files.
 
 Pull requests to expand coverage are welcome.
 
 [Documentation][docs-link]
 
 ## Minimum Supported Rust Version
 
-Requires Rust **1.48** or newer.
+This crate is supported on Rust **1.56** or newer.
 
 [//]: # "badges"
 [crate-image]: https://img.shields.io/crates/v/cosmos-sdk-proto.svg?logo=rust
@@ -31,7 +31,7 @@ Requires Rust **1.48** or newer.
 [build-link]: https://github.com/cosmos/cosmos-rust/actions/workflows/cosmos-sdk-proto.yml
 [license-image]: https://img.shields.io/badge/license-Apache2.0-blue.svg
 [license-link]: https://github.com/cosmos/cosmos-rust/blob/master/LICENSE
-[rustc-image]: https://img.shields.io/badge/rustc-1.48+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
 
 [//]: # "general links"
 [Protobufs]: (https://github.com/cosmos/cosmos-sdk/tree/master/proto/)

cosmos-sdk-proto/src/lib.rs

@@ -1,20 +1,14 @@
-//! The `cosmos-sdk-proto` crate provides access to the Cosmos SDK proto-defined structs.
-//! These are then re-exported in a module structure as close as possible to the proto files.
-//!
-//! The version strings are intentionally excluded, that way users may specify `cosmos-sdk` versions
-//! as a feature argument to this crate and not have to change their imports. For as much as that is
-//! worth considering that modules seem to show up and go away with every RC.
-//!
-//! TODO: actually implement features tag based compilation
-
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![doc = include_str!("../README.md")]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/cosmos/cosmos-rust/main/.images/cosmos.png",
-    html_root_url = "https://docs.rs/cosmos-sdk-proto/0.5.0"
+    html_root_url = "https://docs.rs/cosmos-sdk-proto/0.8.0"
 )]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 #![forbid(unsafe_code)]
 #![warn(trivial_casts, trivial_numeric_casts, unused_import_braces)]
 
+pub use tendermint_proto as tendermint;
+
 /// The version (commit hash) of the Cosmos SDK used when generating this library.
 pub const COSMOS_SDK_VERSION: &str = include_str!("prost/COSMOS_SDK_COMMIT");
 
@@ -201,6 +195,18 @@ pub mod cosmos {
     }
 }
 
+/// CosmWasm protobuf definitions.
+#[cfg(feature = "cosmwasm")]
+#[cfg_attr(docsrs, doc(cfg(feature = "cosmwasm")))]
+pub mod cosmwasm {
+    /// Messages and services handling CosmWasm.
+    pub mod wasm {
+        pub mod v1beta1 {
+            include!("prost/cosmwasm.wasm.v1beta1.rs");
+        }
+    }
+}
+
 /// IBC protobuf definitions.
 pub mod ibc {
     /// IBC applications.

cosmos-sdk-proto/src/prost/COSMOS_SDK_COMMIT

@@ -1 +1 @@
-v0.42.3
+v0.44.1

cosmos-sdk-proto/src/prost/IBC_COMMIT

@@ -0,0 +1 @@
+v1.2.0

cosmos-sdk-proto/src/prost/WASMD_COMMIT

@@ -0,0 +1 @@
+v0.17.0