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.

Sign up for GitHub

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

Jump to bottom

Prevent Commit after ChangeView #642

Merged
merged 35 commits into from
Mar 25, 2019
Merged

Prevent Commit after ChangeView #642

merged 35 commits into from
Mar 25, 2019

Commits on Mar 18, 2019

  1. Prevent commit after ChangeView.

    @jsolman
    jsolman committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    aa16b7f View commit details
    Browse the repository at this point in the history

  2. Minor simplification.

    @jsolman
    jsolman committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    d686236 View commit details
    Browse the repository at this point in the history

  3. Minimize differences.

    @jsolman
    jsolman committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    0d98768 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2019

  1. Don't consider view changing once F nodes committed.

    @jsolman
    jsolman committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    d9ea44e View commit details
    Browse the repository at this point in the history

  2. Add a comment describing current potential issues.

    @jsolman
    jsolman committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    57065f8 View commit details
    Browse the repository at this point in the history

  3. Save consensus context upon changing view to prevent split commit.

    @jsolman
    jsolman committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    442bfe8 View commit details
    Browse the repository at this point in the history

  4. Adjust comment concerning potential issues.

    @jsolman
    jsolman committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    f471b32 View commit details
    Browse the repository at this point in the history

  5. Further improve comment.

    @jsolman
    jsolman committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    7d5b201 View commit details
    Browse the repository at this point in the history

  6. Reduce to minimal changes to fix the main issue that can cause the ne… 

    …twork to stall creating blocks.
    @jsolman
    jsolman committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    470b35c View commit details
    Browse the repository at this point in the history

  7. Rename helper method that checks if F nodes are already committed.

    @jsolman
    jsolman committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    bfb729e View commit details
    Browse the repository at this point in the history

  8. Greater than F nodes must have committed for it to not be possible fo… 

    …r changing view and coming to consensus.
    @jsolman
    jsolman committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    76bd576 View commit details
    Browse the repository at this point in the history

  9. Rename flag to MoreThanFNodesCommitted.

    @jsolman
    jsolman committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    ee72d58 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into consensus/preventStall

    @vncoelho
    vncoelho committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    3dcc435 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2019

  1. Merge branch 'master' into consensus/preventStall

    @jsolman
    jsolman committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    b18735e View commit details
    Browse the repository at this point in the history

  2. Make a new flag for clarity. Add TODO for fixing counting committed p… 

    …ayloads.
    @jsolman
    jsolman committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    aa365fd View commit details
    Browse the repository at this point in the history

  3. Keep track of commit payloads in all views to support counting commits.

    @jsolman
    jsolman committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    4959176 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into consensus/preventStall

    @jsolman
    jsolman committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    abb8063 View commit details
    Browse the repository at this point in the history

  5. Rename flag for clarity.

    @jsolman
    jsolman committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    68f5235 View commit details
    Browse the repository at this point in the history

  6. Remove unnecessary change of recording commit from another view.

    @jsolman
    jsolman committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    eee35cc View commit details
    Browse the repository at this point in the history

  7. Fix typo in comment.

    @jsolman
    jsolman committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    2e7d8ad View commit details
    Browse the repository at this point in the history

  8. If we already have a commit for the validator at the current view, we… 

    … can return early.
    @jsolman
    jsolman committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    28b45cc View commit details
    Browse the repository at this point in the history

  9. Add warning log for receiving a different commit from a validator. A … 

    …validator should never change their commit at a given height.
    @jsolman
    jsolman committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    b6bf4da View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2019

  1. minor changes

    @erikzhang
    erikzhang committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    ce7685b View commit details
    Browse the repository at this point in the history

  2. use LogLevel.Warning

    @erikzhang
    erikzhang committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    b8beafc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into consensus/preventStall

    @erikzhang
    erikzhang committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    731b915 View commit details
    Browse the repository at this point in the history

  4. Check ViewNumber in OnPrepareRequestReceived() and `OnPrepareResp… 

    …onseReceived()`
    @erikzhang
    erikzhang committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    7ba991b View commit details
    Browse the repository at this point in the history

  5. Simplify OnRecoveryMessageReceived()

    @erikzhang
    erikzhang committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    6fc4864 View commit details
    Browse the repository at this point in the history

  6. minor change

    @erikzhang
    erikzhang committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    b7e7981 View commit details
    Browse the repository at this point in the history

  7. Fix a merge issue. OnConsensusPayload method should not be accepting … 

    …PrepareRequest and PrepareResponse from different views.
    @jsolman
    jsolman committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    9838afc View commit details
    Browse the repository at this point in the history

  8. Revert "Fix a merge issue. OnConsensusPayload method should not be ac… 

    …cepting PrepareRequest and PrepareResponse from different views."

This reverts commit 9838afc.
    @jsolman
    jsolman committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    663a8ae View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into consensus/preventStall 

    Conflicts:
	neo/Consensus/ConsensusService.cs
	neo/Consensus/Helper.cs
    @jsolman
    jsolman committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    d0f89c6 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into consensus/preventStall

    @shargon
    shargon committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    c3005ac View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2019

  1. Merge branch 'master' into consensus/preventStall

    @vncoelho
    vncoelho committed Mar 24, 2019
    Configuration menu
    Copy the full SHA
    dda3e9a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into consensus/preventStall

    @igormcoelho
    igormcoelho committed Mar 24, 2019
    Configuration menu
    Copy the full SHA
    5e925b0 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2019

  1. Merge branch 'master' into consensus/preventStall

    @shargon
    shargon committed Mar 25, 2019
    Configuration menu
    Copy the full SHA
    45091ce View commit details
    Browse the repository at this point in the history