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

Dao fix majorityvote issue #2371

Merged
merged 14 commits into from Feb 9, 2019

Conversation

Projects
None yet
3 participants
@ManfredKarrer
Copy link
Member

ManfredKarrer commented Feb 5, 2019

Fixes #2362

ManfredKarrer added some commits Feb 5, 2019

Fix handling of majority vote
We need to add any valid vote reveal tx / blind vote tx pair for the
majority hash calculation even if the blind vote payload is missing as
that could be relevant for the majority hash calculation. We add an
empty ballotList and meritList in such cases.

@ManfredKarrer ManfredKarrer requested a review from sqrrm Feb 5, 2019

@ManfredKarrer ManfredKarrer changed the title Dao fix majorityvote issue [WIP] Dao fix majorityvote issue Feb 5, 2019

@ManfredKarrer

This comment has been minimized.

Copy link
Member Author

ManfredKarrer commented Feb 5, 2019

Needs more testing before merge.

ManfredKarrer added some commits Feb 5, 2019

Fix onParseBlockChainComplete handler
We had 2 times the onParseTxsComplete called in the version before
Make methods in DaoStateListener default
To avoid empty handlers I have set all methods to default so the client
code implements only the used one.
Move handler code from onNewBlockHeight to
onParseTxsCompleteAfterBatchProcessing to avoid too much UI updates
while parsing.

@ManfredKarrer ManfredKarrer requested a review from ripcurlx as a code owner Feb 5, 2019

ManfredKarrer added some commits Feb 5, 2019

@ManfredKarrer ManfredKarrer changed the title [WIP] Dao fix majorityvote issue Dao fix majorityvote issue Feb 6, 2019

@ManfredKarrer

This comment has been minimized.

Copy link
Member Author

ManfredKarrer commented Feb 6, 2019

@sqrrm I have tested now with different scenarios with blind vote missing, ignore merit for majorit hash case,... Could you give it a critical review and test cycle as well?

Merge branch 'master' into dao-fix-majorityvote-issue
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java
@sqrrm

This comment has been minimized.

Copy link
Member

sqrrm commented Feb 7, 2019

I am looking at this but it will take a while as it's rather complicated. @ripcurlx hope to be done before the next release as I think this is quite important to get in.

@ripcurlx
Copy link
Member

ripcurlx left a comment

utACK

@sqrrm

sqrrm approved these changes Feb 8, 2019

Copy link
Member

sqrrm left a comment

utACK

I added some refactoring as a PR to manfred's repo. Had to refactor to understand what's going on. I haven't tested this yet.

ManfredKarrer added some commits Feb 9, 2019

Merge pull request #2 from sqrrm/refactor-vote-result
Refactor voteresult to make it easier to understand
@ManfredKarrer

This comment has been minimized.

Copy link
Member Author

ManfredKarrer commented Feb 9, 2019

@sqrrm I will merge to not delay release, but please go on testing, its a very critical PR.

@ManfredKarrer ManfredKarrer merged commit 12d2879 into bisq-network:master Feb 9, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ManfredKarrer ManfredKarrer deleted the ManfredKarrer:dao-fix-majorityvote-issue branch Feb 14, 2019

@ripcurlx ripcurlx referenced this pull request Feb 26, 2019

Closed

For February 2019 #224

@sqrrm sqrrm referenced this pull request Feb 28, 2019

Closed

For February 2019 #228

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.