Skip to content

Old PrepareProposal on feature/abci++ppp#9106

Merged
sergio-mena merged 12 commits intofeature/abci++pppfrom
sergio/9104-old-prepare-proposal
Jul 27, 2022
Merged

Old PrepareProposal on feature/abci++ppp#9106
sergio-mena merged 12 commits intofeature/abci++pppfrom
sergio/9104-old-prepare-proposal

Conversation

@sergio-mena
Copy link
Contributor

This PR was done via a longer way (more conflicts) by cherry-picking #7746, rather than #6544 (which would have been simpler).
The reason is that this work was already done 2 weeks ago, for estimating ABCI++ Option 2 in the Q3 planning document.
So, we are reusing this work on branch feature/abci++ppp

Copy link
Contributor

@cmwaters cmwaters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me as a preliminary change

@sergio-mena sergio-mena merged commit 58effdd into feature/abci++ppp Jul 27, 2022
@sergio-mena sergio-mena deleted the sergio/9104-old-prepare-proposal branch July 27, 2022 13:09
@sergio-mena
Copy link
Contributor Author

Closes #9104

@sergio-mena sergio-mena mentioned this pull request Jul 27, 2022
@sergio-mena sergio-mena self-assigned this Aug 3, 2022
samricotta pushed a commit that referenced this pull request Aug 16, 2022
* [Rebased to v0.34.x] abci: PrepareProposal (#6544)

* fixed cherry-pick

* proto changes

* make proto-gen

* UT fixes

* generate Client directive

* mockery

* App fixes

* Disable 'modified tx' hack

* mockery

* Make format

* Fix lint

Co-authored-by: Marko <marbar3778@yahoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done/Merged

Development

Successfully merging this pull request may close these issues.

3 participants