Skip to content

Commit

Permalink
Fix proto generation for missing query client in v0.12.0
Browse files Browse the repository at this point in the history 
The root cause is that `third_party` protos in `ibc-go` includes contains `auth.proto` (which does not contain query client). The generated `.rs` file from `cosmos-sdk` was being overwritten by the one generated by `ibc-go`. Fixes cosmos#219
  • Loading branch information
@devashishdxt
devashishdxt committed May 12, 2022
1 parent 491d130 commit 1efd19f
Show file tree
Hide file tree
Showing 63 changed files with 3,724 additions and 2,933 deletions.
2 changes: 1 addition & 1 deletion cosmos-sdk-go
Submodule cosmos-sdk-go updated 38 files
+1 −1 .github/workflows/lint.yml
+0 −53 .github/workflows/proto-docker.yml
+6 −6 .github/workflows/sims.yml
+1 −1 .github/workflows/tag.yml
+7 −7 .github/workflows/test.yml
+28 −4 CHANGELOG.md
+23 −32 Makefile
+84 −73 README.md
+7 −18 RELEASE_NOTES.md
+0 −2,127 client/docs/swagger_legacy.yaml
+11 −4 contrib/images/Makefile
+22 −0 contrib/images/simd-dlv/Dockerfile
+37 −0 contrib/images/simd-dlv/README.md
+25 −0 contrib/images/simd-dlv/wrapper.sh
+1 −1 contrib/images/simd-env/Dockerfile
+1 −2 contrib/rosetta/node/Dockerfile
+1 −1 contrib/rosetta/rosetta-cli/Dockerfile
+39 −15 docker-compose.yml
+4 −8 docs/.vuepress/config.js
+3 −3 docs/README.md
+1 −2 docs/versions
+82 −14 go.mod
+20 −22 go.sum
+15 −2 server/api/server.go
+3 −1 server/start.go
+0 −16 server/tm_cmds.go
+4 −1 server/util.go
+1 −1 simapp/README.md
+4 −4 types/coin.go
+1 −1 types/module/module.go
+37 −5 x/auth/vesting/types/period.go
+4 −0 x/genutil/client/cli/gentx.go
+93 −82 x/genutil/client/testutil/suite.go
+2 −2 x/genutil/gentx_test.go
+130 −41 x/staking/keeper/delegation.go
+10 −1 x/staking/keeper/delegation_test.go
+20 −22 x/upgrade/abci_test.go
+4 −2 x/upgrade/keeper/keeper.go
96 changes: 48 additions & 48 deletions cosmos-sdk-proto/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,28 @@
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");
pub const COSMOS_SDK_VERSION: &str = include_str!("prost/cosmos-sdk/COSMOS_SDK_COMMIT");

/// Cosmos protobuf definitions.
pub mod cosmos {
/// Authentication of accounts and transactions.
pub mod auth {
pub mod v1beta1 {
include!("prost/cosmos.auth.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.auth.v1beta1.rs");
}
}

/// Granting of arbitrary privileges from one account to another.
pub mod authz {
pub mod v1beta1 {
include!("prost/cosmos.authz.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.authz.v1beta1.rs");
}
}

/// Balances.
pub mod bank {
pub mod v1beta1 {
include!("prost/cosmos.bank.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.bank.v1beta1.rs");
}
}

Expand All @@ -42,147 +42,147 @@ pub mod cosmos {
/// (the blockchain), and the state machine (the application).
pub mod abci {
pub mod v1beta1 {
include!("prost/cosmos.base.abci.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.base.abci.v1beta1.rs");
}
}

/// Key-value pairs.
pub mod kv {
pub mod v1beta1 {
include!("prost/cosmos.base.kv.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.base.kv.v1beta1.rs");
}
}

/// Query support.
pub mod query {
pub mod v1beta1 {
include!("prost/cosmos.base.query.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.base.query.v1beta1.rs");
}
}

/// Reflection support.
pub mod reflection {
pub mod v1beta1 {
include!("prost/cosmos.base.reflection.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.base.reflection.v1beta1.rs");
}

pub mod v2alpha1 {
include!("prost/cosmos.base.reflection.v2alpha1.rs");
include!("prost/cosmos-sdk/cosmos.base.reflection.v2alpha1.rs");
}
}

/// Snapshots containing Tendermint state sync info.
pub mod snapshots {
pub mod v1beta1 {
include!("prost/cosmos.base.snapshots.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.base.snapshots.v1beta1.rs");
}
}

/// Data structure that holds the state of the application.
pub mod store {
pub mod v1beta1 {
include!("prost/cosmos.base.store.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.base.store.v1beta1.rs");
}
}

pub mod v1beta1 {
include!("prost/cosmos.base.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.base.v1beta1.rs");
}

pub mod tendermint {
pub mod v1beta1 {
include!("prost/cosmos.base.tendermint.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.base.tendermint.v1beta1.rs");
}
}
}

/// Crisis handling
pub mod crisis {
pub mod v1beta1 {
include!("prost/cosmos.crisis.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.crisis.v1beta1.rs");
}
}

/// Cryptographic primitives.
pub mod crypto {
/// Multi-signature support.
pub mod multisig {
include!("prost/cosmos.crypto.multisig.rs");
include!("prost/cosmos-sdk/cosmos.crypto.multisig.rs");
pub mod v1beta1 {
include!("prost/cosmos.crypto.multisig.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.crypto.multisig.v1beta1.rs");
}
}
pub mod ed25519 {
include!("prost/cosmos.crypto.ed25519.rs");
include!("prost/cosmos-sdk/cosmos.crypto.ed25519.rs");
}
pub mod secp256k1 {
include!("prost/cosmos.crypto.secp256k1.rs");
include!("prost/cosmos-sdk/cosmos.crypto.secp256k1.rs");
}
pub mod secp256r1 {
include!("prost/cosmos.crypto.secp256r1.rs");
include!("prost/cosmos-sdk/cosmos.crypto.secp256r1.rs");
}
}

/// Messages and services handling token distribution
pub mod distribution {
pub mod v1beta1 {
include!("prost/cosmos.distribution.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.distribution.v1beta1.rs");
}
}

/// Messages and services handling evidence
pub mod evidence {
pub mod v1beta1 {
include!("prost/cosmos.evidence.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.evidence.v1beta1.rs");
}
}

/// Allows accounts to grant fee allowances and to use fees from their accounts.
pub mod feegrant {
pub mod v1beta1 {
include!("prost/cosmos.feegrant.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.feegrant.v1beta1.rs");
}
}

/// Messages and services handling gentx's
pub mod genutil {
pub mod v1beta1 {
include!("prost/cosmos.genutil.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.genutil.v1beta1.rs");
}
}

/// Messages and services handling governance
pub mod gov {
pub mod v1beta1 {
include!("prost/cosmos.gov.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.gov.v1beta1.rs");
}
}

/// Messages and services handling minting
pub mod mint {
pub mod v1beta1 {
include!("prost/cosmos.mint.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.mint.v1beta1.rs");
}
}

/// Messages and services handling chain parameters
pub mod params {
pub mod v1beta1 {
include!("prost/cosmos.params.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.params.v1beta1.rs");
}
}

/// Handling slashing parameters and unjailing
pub mod slashing {
pub mod v1beta1 {
include!("prost/cosmos.slashing.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.slashing.v1beta1.rs");
}
}

/// Proof-of-Stake layer for public blockchains.
pub mod staking {
pub mod v1beta1 {
include!("prost/cosmos.staking.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.staking.v1beta1.rs");
}
}

Expand All @@ -191,26 +191,26 @@ pub mod cosmos {
/// Transaction signing support.
pub mod signing {
pub mod v1beta1 {
include!("prost/cosmos.tx.signing.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.tx.signing.v1beta1.rs");
}
}

pub mod v1beta1 {
include!("prost/cosmos.tx.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.tx.v1beta1.rs");
}
}

/// Services for the upgrade module.
pub mod upgrade {
pub mod v1beta1 {
include!("prost/cosmos.upgrade.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.upgrade.v1beta1.rs");
}
}

/// Services and tx's for the vesting module.
pub mod vesting {
pub mod v1beta1 {
include!("prost/cosmos.vesting.v1beta1.rs");
include!("prost/cosmos-sdk/cosmos.vesting.v1beta1.rs");
}
}
}
Expand All @@ -222,7 +222,7 @@ pub mod cosmwasm {
/// Messages and services handling CosmWasm.
pub mod wasm {
pub mod v1 {
include!("prost/cosmwasm.wasm.v1.rs");
include!("prost/wasmd/cosmwasm.wasm.v1.rs");
}
}
}
Expand All @@ -235,29 +235,29 @@ pub mod ibc {
pub mod interchain_accounts {
pub mod controller {
pub mod v1 {
include!("prost/ibc.applications.interchain_accounts.controller.v1.rs");
include!("prost/ibc-go/ibc.applications.interchain_accounts.controller.v1.rs");
}
}

pub mod host {
pub mod v1 {
include!("prost/ibc.applications.interchain_accounts.host.v1.rs");
include!("prost/ibc-go/ibc.applications.interchain_accounts.host.v1.rs");
}
}

pub mod v1 {
include!("prost/ibc.applications.interchain_accounts.v1.rs");
include!("prost/ibc-go/ibc.applications.interchain_accounts.v1.rs");
}
}

/// Transfer support.
pub mod transfer {
pub mod v1 {
include!("prost/ibc.applications.transfer.v1.rs");
include!("prost/ibc-go/ibc.applications.transfer.v1.rs");
}

pub mod v2 {
include!("prost/ibc.applications.transfer.v2.rs");
include!("prost/ibc-go/ibc.applications.transfer.v2.rs");
}
}
}
Expand All @@ -267,35 +267,35 @@ pub mod ibc {
/// IBC channels.
pub mod channel {
pub mod v1 {
include!("prost/ibc.core.channel.v1.rs");
include!("prost/ibc-go/ibc.core.channel.v1.rs");
}
}

/// IBC client.
pub mod client {
pub mod v1 {
include!("prost/ibc.core.client.v1.rs");
include!("prost/ibc-go/ibc.core.client.v1.rs");
}
}

/// IBC commitments.
pub mod commitment {
pub mod v1 {
include!("prost/ibc.core.commitment.v1.rs");
include!("prost/ibc-go/ibc.core.commitment.v1.rs");
}
}

/// IBC connections.
pub mod connection {
pub mod v1 {
include!("prost/ibc.core.connection.v1.rs");
include!("prost/ibc-go/ibc.core.connection.v1.rs");
}
}

/// IBC types.
pub mod types {
pub mod v1 {
include!("prost/ibc.core.types.v1.rs");
include!("prost/ibc-go/ibc.core.types.v1.rs");
}
}
}
Expand All @@ -304,27 +304,27 @@ pub mod ibc {
pub mod lightclients {
pub mod localhost {
pub mod v1 {
include!("prost/ibc.lightclients.localhost.v1.rs");
include!("prost/ibc-go/ibc.lightclients.localhost.v1.rs");
}
}
pub mod solomachine {
pub mod v1 {
include!("prost/ibc.lightclients.solomachine.v1.rs");
include!("prost/ibc-go/ibc.lightclients.solomachine.v1.rs");
}

pub mod v2 {
include!("prost/ibc.lightclients.solomachine.v2.rs");
include!("prost/ibc-go/ibc.lightclients.solomachine.v2.rs");
}
}
pub mod tendermint {
pub mod v1 {
include!("prost/ibc.lightclients.tendermint.v1.rs");
include!("prost/ibc-go/ibc.lightclients.tendermint.v1.rs");
}
}
}
}

/// ICS23 protobuf definitions.
pub mod ics23 {
include!("prost/ics23.rs");
include!("prost/ibc-go/ics23.rs");
}
0 cosmos-sdk-proto/src/prost/COSMOS_SDK_COMMIT → ...to/src/prost/cosmos-sdk/COSMOS_SDK_COMMIT
View file
File renamed without changes.
Loading

0 comments on commit 1efd19f

Please sign in to comment.