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

[neox] consensus #1719

Merged
merged 60 commits into from
Jul 13, 2020
Merged

[neox] consensus #1719

merged 60 commits into from
Jul 13, 2020

Conversation

ZhangTao1596
Copy link
Contributor

@ZhangTao1596 ZhangTao1596 commented Jun 22, 2020

Change #1702 to neox.

mpt integration (Step 1/4)

Process state root in consensus.

  • Add StateRootSignature when send PrepareRequest and PrepareResponse.
  • Check StateRootSignature proposaled in PrepareRequest and PrepareResponse received.
  • Relay StateRoot when commit.

@ZhangTao1596
Copy link
Contributor Author

@erikzhang Can you please review this one?

@ZhangTao1596
Copy link
Contributor Author

@shargon Can you please have a look?

@ZhangTao1596 ZhangTao1596 mentioned this pull request Jun 24, 2020
@ZhangTao1596
Copy link
Contributor Author

@erikzhang Can you please have a look?

@ZhangTao1596
Copy link
Contributor Author

@erikzhang @shargon Merge?

@ZhangTao1596
Copy link
Contributor Author

@shargon Merge?

@shargon shargon merged commit 437d919 into neo-project:neox Jul 13, 2020
ZhangTao1596 added 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 ZhangTao1596 deleted the neox-consensus branch July 17, 2020 02:40
ZhangTao1596 added 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 added 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 added 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>
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.

None yet

2 participants