Summary

Update abci++ in such a way that it includes all changes made on the master branch

Problem Definition

There are two options:
a) try rebasing abci++ onto master
b) if the conflicts are unmanageable, it may be better to just merge master into abci++ (less clean, more practical)

How to deal with protobufs:

• at the moment, leave them in the Go repo (resolve conflicts by "keep the modified file")
• when abci: update proto's to reflect changes in ABCI++  spec#386 is done, then execute on ABCI++: Synchronize PrepareProposal spec and implementation #7654

--> At the end of this effort, ABCI++ doesn't necessarily build/run correctly. So #7654 and #7655 might need to be tacked in the same PR

Dependencies

None

For Admin Use

• Not duplicate issue
• Appropriate labels applied
• Appropriate contributors tagged
• Contributor assigned/self-assigned