[bisq-network/bisq] Handle dao state conflicts better (#2674)

[Manfred Karrer]

- Check if conflicting node is seed node or not. Show info in list entry
and only show resync button and red color in text if conflict is with
seed node.
- At resync move all p2p network data to a dedicated directory so they
will be reloaded from the seeds.
You can view, comment on, or merge this pull request online at:

  https://github.com/bisq-network/bisq/pull/2674

-- Commit Summary --

  * Handle dao state conflicts better

-- File Changes --

    M common/src/main/java/bisq/common/storage/FileManager.java (11)
    M core/src/main/java/bisq/core/dao/monitoring/BlindVoteStateMonitoringService.java (33)
    M core/src/main/java/bisq/core/dao/monitoring/DaoStateMonitoringService.java (34)
    M core/src/main/java/bisq/core/dao/monitoring/ProposalStateMonitoringService.java (33)
    M core/src/main/resources/i18n/displayStrings.properties (18)
    M desktop/src/main/java/bisq/desktop/main/dao/monitor/StateInConflictListItem.java (15)
    M desktop/src/main/java/bisq/desktop/main/dao/monitor/StateMonitorView.java (72)
    M desktop/src/main/java/bisq/desktop/main/dao/monitor/blindvotes/BlindVoteStateInConflictListItem.java (9)
    M desktop/src/main/java/bisq/desktop/main/dao/monitor/blindvotes/BlindVoteStateMonitorView.java (40)
    M desktop/src/main/java/bisq/desktop/main/dao/monitor/daostate/DaoStateInConflictListItem.java (9)
    M desktop/src/main/java/bisq/desktop/main/dao/monitor/daostate/DaoStateMonitorView.java (32)
    M desktop/src/main/java/bisq/desktop/main/dao/monitor/proposals/ProposalStateInConflictListItem.java (9)
    M desktop/src/main/java/bisq/desktop/main/dao/monitor/proposals/ProposalStateMonitorView.java (34)

-- Patch Links --

https://github.com/bisq-network/bisq/pull/2674.patch
https://github.com/bisq-network/bisq/pull/2674.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/2674
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20190408/3b2a6a7e/attachment-0001.html>