On branch mergify/bp/v0.37.x/pr-9356
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit 101bf50e7.
  (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)

Changes to be committed:
	modified:   .github/workflows/check-generated.yml
	modified:   CHANGELOG_PENDING.md
	modified:   CONTRIBUTING.md
	modified:   Makefile
	modified:   abci/types/messages.go
	modified:   abci/types/messages_test.go
	modified:   abci/types/types.go
	modified:   abci/types/types.pb.go
	modified:   blocksync/msgs.go
	modified:   blocksync/msgs_test.go
	modified:   buf.gen.yaml
	modified:   buf.yaml
	modified:   consensus/msgs.go
	modified:   consensus/msgs_test.go
	modified:   consensus/reactor.go
	modified:   consensus/replay_test.go
	modified:   consensus/state.go
	modified:   consensus/wal.go
	modified:   docs/architecture/adr-009-ABCI-design.md
	modified:   docs/architecture/adr-081-protobuf-mgmt.md
	modified:   evidence/pool.go
	modified:   go.sum
	modified:   libs/protoio/io.go
	modified:   libs/protoio/io_test.go
	modified:   libs/protoio/reader.go
	modified:   libs/protoio/writer.go
	modified:   light/rpc/client.go
	modified:   mempool/v0/clist_mempool_test.go
	modified:   p2p/conn/connection.go
	modified:   p2p/conn/connection_test.go
	modified:   p2p/conn/evil_secret_connection_test.go
	modified:   p2p/conn/secret_connection.go
	modified:   p2p/pex/pex_reactor.go
	modified:   p2p/pex/pex_reactor_test.go
	modified:   privval/file.go
	modified:   privval/msgs.go
	modified:   privval/msgs_test.go
	modified:   proto/buf.lock
	modified:   proto/buf.yaml
	modified:   proto/tendermint/abci/types.proto
	modified:   proto/tendermint/blocksync/types.pb.go
	modified:   proto/tendermint/consensus/types.pb.go
	modified:   proto/tendermint/consensus/wal.pb.go
	modified:   proto/tendermint/crypto/keys.pb.go
	modified:   proto/tendermint/crypto/proof.pb.go
	modified:   proto/tendermint/libs/bits/types.pb.go
	modified:   proto/tendermint/mempool/types.pb.go
	modified:   proto/tendermint/p2p/conn.pb.go
	modified:   proto/tendermint/p2p/pex.pb.go
	modified:   proto/tendermint/p2p/types.pb.go
	modified:   proto/tendermint/privval/types.pb.go
	modified:   proto/tendermint/rpc/grpc/types.pb.go
	modified:   proto/tendermint/state/types.pb.go
	modified:   proto/tendermint/statesync/types.pb.go
	modified:   proto/tendermint/store/types.pb.go
	modified:   proto/tendermint/types/block.pb.go
	modified:   proto/tendermint/types/canonical.pb.go
	modified:   proto/tendermint/types/events.pb.go
	modified:   proto/tendermint/types/evidence.pb.go
	modified:   proto/tendermint/types/params.pb.go
	modified:   proto/tendermint/types/types.pb.go
	modified:   proto/tendermint/types/validator.pb.go
	modified:   proto/tendermint/version/types.pb.go
	modified:   rpc/grpc/types.pb.go
	modified:   scripts/proto-gen.sh
	modified:   state/indexer/sink/psql/psql.go
	modified:   state/indexer/sink/psql/psql_test.go
	modified:   state/state.go
	modified:   state/store.go
	modified:   state/txindex/kv/kv.go
	modified:   state/txindex/kv/kv_test.go
	modified:   statesync/messages.go
	modified:   statesync/messages_test.go
	modified:   store/store.go
	modified:   store/store_test.go
	new file:   third_party/proto/gogoproto/README.md
	deleted:    third_party/proto/gogoproto/gogo.proto
	modified:   tools/proto/Dockerfile
	modified:   types/block.go
	modified:   types/block_test.go
	modified:   types/encoding_helper.go
	modified:   types/proposal_test.go
	modified:   types/vote_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod