Skip to content

backport: catch up on the latest changes from v0.10#528

Merged
shotonoff merged 9 commits intov0.11-devfrom
backport-v0.10
Dec 15, 2022
Merged

backport: catch up on the latest changes from v0.10#528
shotonoff merged 9 commits intov0.11-devfrom
backport-v0.10

Conversation

@shotonoff
Copy link
Collaborator

@shotonoff shotonoff commented Dec 15, 2022

Issue being fixed or feature implemented

To keep the branch v0.11-dev up o date, need to backport the latest changes

What was done?

Backported the latest changes from v0.10-dev

How Has This Been Tested?

Unit and e2e tests

Breaking Changes

N/A

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation

For repository code-owners and collaborators only

  • I have assigned this pull request to a milestone

lklimek and others added 9 commits December 13, 2022 16:27
* fix(consensus): ProcessProposal executed twice for a block

* fix(consensus): ensure process proposal is called once before finalize block

* fix(consensus): ensure ProcessProposal is called at least once for a block
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3.3.1 to 3.4.0.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@v3.3.1...v3.4.0)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.9.0 to 1.10.0.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](bufbuild/buf-setup-action@v1.9.0...v1.10.0)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix(consensus): proposer-based timestamp is broken

* fix(consensus): initial block time  must be equal genesis time

* test(consensus): update TestStateProposalTime for PBTS

* test(consensus): fix TestStateLock_POLSafety2 for PBTS

* Revert "test(consensus): skip broken PBTS tests (#500)"

This reverts commit 02452f1.

* refactor(time): simplify time processing

* feat(log): Allow definition of log assertions in TestingLogger

* test(consensus): refactor PBTS tests

* chore(log): replace TestingLogger interface with struct

* chore(state): move block time logic to separate fn
* chore(abci)!: remove Snapshot.core_chain_locked_height

* build: bump Golang to 1.19
* refactor: improve wal iterator

* feat: add config parameter to turn on/off skipping the WAL rounds to the last

* refactor: clean up code

* refactor: add TestWALRoundsSkipper

* fix: derive a commit from vote-set during replay

* fix: add validators priority incrementing to select proper proposer
Copy link
Collaborator

@lklimek lklimek left a comment

Choose a reason for hiding this comment

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

Please use rebase or merge commit approach

@shotonoff shotonoff merged commit fe1d872 into v0.11-dev Dec 15, 2022
@shotonoff shotonoff deleted the backport-v0.10 branch December 15, 2022 12:17
@shotonoff shotonoff restored the backport-v0.10 branch December 15, 2022 13:17
@shotonoff shotonoff deleted the backport-v0.10 branch December 15, 2022 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants