Merged
Conversation
added 11 commits
June 18, 2020 15:08
Author
|
@erikzhang Can you please review this one? |
Author
|
@shargon Can you please have a look? |
Closed
Author
|
@erikzhang Can you please have a look? |
3 tasks
Author
|
@erikzhang @shargon Merge? |
shargon
reviewed
Jul 8, 2020
shargon
approved these changes
Jul 8, 2020
Author
|
@shargon Merge? |
ZhangTao1596
pushed a commit
to ZhangTao1596/neo
that referenced
this pull request
Jul 15, 2020
* don't use snapshot directly in plugin * recover * consensus state root * fix build error * rename * remerge * rm GetMessage * rename * throw exception when no script hash in state root * Clean double enter * Clean big line * format * put root sig into request and response * update consensus ut * Check Json.Serialize map keys (neo-project#1705) * don't use snapshot directly in plugin * recover * consensus state root * fix build error * rename * remerge * rm GetMessage * rename * throw exception when no script hash in state root * Clean double enter * Clean big line * format * put root sig into request and response * update consensus ut * fix some * fix some * format * comment * fix * requst in recovery * StateRootSignature fixed size * no need ？ * format * Update ConsensusContext.cs * Check sc.Complete Co-authored-by: Shargon <shargon@gmail.com>
ZhangTao1596
pushed a commit
to ZhangTao1596/neo
that referenced
this pull request
Jul 17, 2020
* don't use snapshot directly in plugin * recover * consensus state root * fix build error * rename * remerge * rm GetMessage * rename * throw exception when no script hash in state root * Clean double enter * Clean big line * format * put root sig into request and response * update consensus ut * Check Json.Serialize map keys (neo-project#1705) * don't use snapshot directly in plugin * recover * consensus state root * fix build error * rename * remerge * rm GetMessage * rename * throw exception when no script hash in state root * Clean double enter * Clean big line * format * put root sig into request and response * update consensus ut * fix some * fix some * format * comment * fix * requst in recovery * StateRootSignature fixed size * no need ？ * format * Update ConsensusContext.cs * Check sc.Complete Co-authored-by: Shargon <shargon@gmail.com>
ZhangTao1596
pushed a commit
to ZhangTao1596/neo
that referenced
this pull request
Jul 24, 2020
* don't use snapshot directly in plugin * recover * consensus state root * fix build error * rename * remerge * rm GetMessage * rename * throw exception when no script hash in state root * Clean double enter * Clean big line * format * put root sig into request and response * update consensus ut * Check Json.Serialize map keys (neo-project#1705) * don't use snapshot directly in plugin * recover * consensus state root * fix build error * rename * remerge * rm GetMessage * rename * throw exception when no script hash in state root * Clean double enter * Clean big line * format * put root sig into request and response * update consensus ut * fix some * fix some * format * comment * fix * requst in recovery * StateRootSignature fixed size * no need ？ * format * Update ConsensusContext.cs * Check sc.Complete Co-authored-by: Shargon <shargon@gmail.com>
ZhangTao1596
pushed a commit
to ZhangTao1596/neo
that referenced
this pull request
Aug 12, 2020
* don't use snapshot directly in plugin * recover * consensus state root * fix build error * rename * remerge * rm GetMessage * rename * throw exception when no script hash in state root * Clean double enter * Clean big line * format * put root sig into request and response * update consensus ut * Check Json.Serialize map keys (neo-project#1705) * don't use snapshot directly in plugin * recover * consensus state root * fix build error * rename * remerge * rm GetMessage * rename * throw exception when no script hash in state root * Clean double enter * Clean big line * format * put root sig into request and response * update consensus ut * fix some * fix some * format * comment * fix * requst in recovery * StateRootSignature fixed size * no need ？ * format * Update ConsensusContext.cs * Check sc.Complete Co-authored-by: Shargon <shargon@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Change #1702 to
neox.mpt integration (Step 1/4)
Process state root in consensus.
StateRootSignaturewhen sendPrepareRequestandPrepareResponse.StateRootSignatureproposaled inPrepareRequestandPrepareResponsereceived.StateRootwhen commit.