Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge master into 2.2 #2224

Closed
wants to merge 31 commits into
base: develop
from

Conversation

Projects
None yet
4 participants
@faustbrian
Copy link
Collaborator

faustbrian commented Mar 11, 2019

Proposed changes

Merge master into develop as it has some 2.2 commits that are missing from develop.

Types of changes

  • Other

Checklist

  • I have read the CONTRIBUTING documentation
  • Lint and unit tests pass locally with my changes

faustbrian and others added some commits Feb 12, 2019

refactor(core-forger): Increase timeout for getting the network state (
…#2208)

* refactor(core-forger): Increase timeout for getting the network state

The 2 seconds timeout is too short and can unnecessary blow up the
forging process in cases where it is possible to forge successfully.

Set it to an arbitrary 7 seconds which is block time minus 1 second for
other activities.

Elaborate log messages by explicitly saying "Will not forge" + an
explanation "why" when the code would decide not to forge.

* Increase the timeout to only 4s to leave more time for propagation
feat(core-p2p): Don't spoil the quorum if the peer has !forgingAllowed (
#2214)

We need >66% quorum to forge and thus we should not count peers that
report "forgingAllowed: false" towards no-quorum ones, because too many
such peers could trip the forger to skip a block.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.