Skip to content

Conversation

sergio-mena
Copy link
Contributor

As per title

(it was ff-merge)


PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments

sergio-mena and others added 5 commits March 8, 2023 17:54
* [partial cherry-pick] abci: Move `app_hash` parameter from `Commit` to `FinalizeBlock` (#8664)

* Removed from proto

* make proto-gen

* make build works

* make some tests pass

* Fix TestMempoolTxConcurrentWithCommit

* Minor change

* Update abci/types/types.go

* Update internal/state/execution.go

* Update test/e2e/app/state.go

Co-authored-by: Callum Waters <cmwaters19@gmail.com>

* Updated changelog and `UPGRADING.md`

* Fixed abci-cli tests, and doc

* Addressed @cmwaters' comments

* Addressed @cmwaters' comments, part 2

Co-authored-by: Callum Waters <cmwaters19@gmail.com>

* Levftover typo in spec

---------

Co-authored-by: Callum Waters <cmwaters19@gmail.com>
)

* CometBFT renaming in types.proto

* AppHash

* Make proto-gen

* Trying 1.20.2 explicitly
* e2e: programmable ABCI method times

* fix linting error

Co-authored-by: Callum Waters <cmwaters19@gmail.com>
* Pass vote extension signature in `PrepareProposal`

* make proto-gen

* Verify extensions at PrepareProposal

* Addressed @thanethomson's comments

* Fix vote extension activation in e2e

* ProcessProposal: 1st try

* Working....

* Refactoring

* Verify signatrue in unit test

* spacing

* Addressed @lasarojc's comments

* Fix test
@sergio-mena sergio-mena self-assigned this Mar 14, 2023
@sergio-mena sergio-mena requested review from a team as code owners March 14, 2023 16:47
Copy link
Contributor

@mzabaluev mzabaluev left a comment

Choose a reason for hiding this comment

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

The protobuf changes look good to me.
I trust reviews on the PRs targeting the source branch for the rest of the code changes.

@sergio-mena
Copy link
Contributor Author

@mzabaluev (as I mentioned in Monday's meeting) Bear in mind there's just one more incremental proto change upcoming.
I have a draft branch locally, let me know if you want to take a look and I'll push it to GitHub

@sergio-mena sergio-mena merged commit b4699df into feature/proto-upgrade Mar 14, 2023
@sergio-mena sergio-mena deleted the sergio/ff-merging-abci++vef branch March 14, 2023 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants