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

You are currently cherry-picking commit 71cd08774.
  (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:
	new file:   .changelog/unreleased/breaking-changes/2843-abci-types-go-api.md
	new file:   .changelog/unreleased/breaking-changes/2843-abci-types-validator-update-pubkey.md
	new file:   .changelog/unreleased/breaking-changes/2843-proto-abci-v1-validator-update.md
	modified:   abci/example/kvstore/helpers.go
	modified:   abci/example/kvstore/kvstore_test.go
	modified:   abci/tests/server/client.go
	modified:   abci/types/pubkey.go
	modified:   abci/types/util.go
	modified:   api/cometbft/abci/v1/types.pb.go
	modified:   crypto/encoding/codec.go
	new file:   crypto/encoding/codec_test.go
	modified:   internal/consensus/common_test.go
	modified:   internal/consensus/reactor_test.go
	modified:   internal/consensus/replay.go
	modified:   internal/consensus/replay_test.go
	modified:   proto/cometbft/abci/v1/types.proto
	modified:   proto/cometbft/types/v1/params.proto
	modified:   rpc/client/evidence_test.go
	modified:   spec/abci/abci++_methods.md
	modified:   spec/core/state.md
	modified:   state/execution.go
	modified:   state/execution_test.go
	modified:   state/helpers_test.go
	modified:   state/state_test.go
	modified:   test/e2e/app/app.go
	modified:   types/params_test.go
	modified:   types/protobuf.go
	modified:   types/protobuf_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   abci/example/kvstore/kvstore.go