osmosis-labs / cosmos-sdk

:chains: A Framework for Building High Value Public Blockchains :sparkles:
https://cosmos.network/
Apache License 2.0
14 stars 31 forks source link

feat: Add proto annotations for amino json (backport #412) #459

Closed mergify[bot] closed 1 year ago

mergify[bot] commented 1 year ago

This is an automatic backport of pull request #412 done by Mergify. Cherry-pick of c3a425b835ac5e2a9a41a697b7ce2bb0bb169b83 has failed:

On branch mergify/bp/v16.x/pr-412
Your branch is up to date with 'origin/v16.x'.

You are currently cherry-picking commit c3a425b83.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   crypto/keys/ed25519/keys.pb.go
    both modified:   crypto/keys/multisig/keys.pb.go
    both modified:   crypto/keys/secp256k1/keys.pb.go
    both modified:   scripts/protocgen.sh
    both modified:   types/coin.pb.go
    both added:      types/tx/amino/amino.pb.go
    both modified:   x/auth/types/auth.pb.go
    both modified:   x/auth/types/genesis.pb.go
    both modified:   x/auth/vesting/types/tx.pb.go
    both modified:   x/authz/authz.pb.go
    both modified:   x/authz/genesis.pb.go
    both modified:   x/authz/tx.pb.go
    both modified:   x/bank/types/authz.pb.go
    both modified:   x/bank/types/bank.pb.go
    both modified:   x/bank/types/genesis.pb.go
    both modified:   x/bank/types/query.pb.go
    both modified:   x/bank/types/tx.pb.go
    both modified:   x/capability/types/capability.pb.go
    both modified:   x/capability/types/genesis.pb.go
    both modified:   x/crisis/types/genesis.pb.go
    both modified:   x/crisis/types/tx.pb.go
    both modified:   x/distribution/types/distribution.pb.go
    both modified:   x/distribution/types/genesis.pb.go
    both modified:   x/distribution/types/query.pb.go
    both modified:   x/distribution/types/tx.pb.go
    both modified:   x/evidence/types/evidence.pb.go
    both modified:   x/evidence/types/tx.pb.go
    both modified:   x/feegrant/feegrant.pb.go
    both modified:   x/feegrant/genesis.pb.go
    both modified:   x/feegrant/tx.pb.go
    both modified:   x/genutil/types/genesis.pb.go
    both modified:   x/gov/types/genesis.pb.go
    both modified:   x/gov/types/gov.pb.go
    both modified:   x/gov/types/query.pb.go
    both modified:   x/gov/types/tx.pb.go
    both modified:   x/mint/types/genesis.pb.go
    both modified:   x/mint/types/mint.pb.go
    both modified:   x/mint/types/query.pb.go
    both modified:   x/params/types/proposal/params.pb.go
    both modified:   x/params/types/proposal/query.pb.go
    both modified:   x/slashing/types/genesis.pb.go
    both modified:   x/slashing/types/query.pb.go
    both modified:   x/slashing/types/slashing.pb.go
    both modified:   x/slashing/types/tx.pb.go
    both modified:   x/staking/types/authz.pb.go
    both modified:   x/staking/types/genesis.pb.go
    both modified:   x/staking/types/query.pb.go
    both modified:   x/staking/types/staking.pb.go
    both modified:   x/staking/types/tx.pb.go
    both modified:   x/upgrade/types/upgrade.pb.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com