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

Dao: fix vote reveal tx publishing #2195

Merged
merged 13 commits into from
Jan 5, 2019
Merged

Dao: fix vote reveal tx publishing #2195

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ff22470
Improve logging
ManfredKarrer Jan 3, 2019
9658115
Add chainTipHeight property
ManfredKarrer Jan 3, 2019
00d0aa5
Use chain tip height for vote reveal tx publishing
ManfredKarrer Jan 3, 2019
4fd8490
Handle late vote reveal txs
ManfredKarrer Jan 3, 2019
e70612d
Merge branch 'master' into dao-fix-vote-reveal-tx-publishing
ManfredKarrer Jan 3, 2019
ef37dc3
Set chainTipHeight before parsing.
ManfredKarrer Jan 3, 2019
c137e7e
Refactor maybeRevealVotes method.
ManfredKarrer Jan 3, 2019
0a9f4fc
Remove phase and cycle check for vote reveal txs.
ManfredKarrer Jan 3, 2019
c1792a3
Ignore items if isBlindVoteInCorrectPhaseAndCycle is false.
ManfredKarrer Jan 3, 2019
c87383a
Refactorings
ManfredKarrer Jan 3, 2019
d23bb2c
Improve logs
ManfredKarrer Jan 3, 2019
2f9125a
Improve logs
ManfredKarrer Jan 3, 2019
4d8a348
Merge branch 'master' into dao-fix-vote-reveal-tx-publishing
ManfredKarrer Jan 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@
import bisq.core.dao.governance.blindvote.BlindVote;
import bisq.core.dao.governance.blindvote.BlindVoteConsensus;
import bisq.core.dao.governance.blindvote.BlindVoteListService;
import bisq.core.dao.governance.blindvote.BlindVoteValidator;
import bisq.core.dao.governance.blindvote.storage.BlindVotePayload;
import bisq.core.dao.governance.myvote.MyVote;
import bisq.core.dao.governance.myvote.MyVoteListService;
import bisq.core.dao.governance.period.PeriodService;
import bisq.core.dao.node.BsqNode;
import bisq.core.dao.node.BsqNodeProvider;
import bisq.core.dao.state.DaoStateListener;
import bisq.core.dao.state.DaoStateService;
import bisq.core.dao.state.model.blockchain.Block;
Expand Down Expand Up @@ -75,7 +76,6 @@
public class VoteRevealService implements DaoStateListener, DaoSetupService {
private final DaoStateService daoStateService;
private final BlindVoteListService blindVoteListService;
private final BlindVoteValidator blindVoteValidator;
private final PeriodService periodService;
private final MyVoteListService myVoteListService;
private final BsqWalletService bsqWalletService;
Expand All @@ -86,6 +86,7 @@ public class VoteRevealService implements DaoStateListener, DaoSetupService {
//TODO UI should listen to that
@Getter
private final ObservableList<VoteRevealException> voteRevealExceptions = FXCollections.observableArrayList();
private final BsqNode bsqNode;


///////////////////////////////////////////////////////////////////////////////////////////
Expand All @@ -95,22 +96,23 @@ public class VoteRevealService implements DaoStateListener, DaoSetupService {
@Inject
public VoteRevealService(DaoStateService daoStateService,
BlindVoteListService blindVoteListService,
BlindVoteValidator blindVoteValidator,
PeriodService periodService,
MyVoteListService myVoteListService,
BsqWalletService bsqWalletService,
BtcWalletService btcWalletService,
P2PService p2PService,
WalletsManager walletsManager) {
WalletsManager walletsManager,
BsqNodeProvider bsqNodeProvider) {
this.daoStateService = daoStateService;
this.blindVoteListService = blindVoteListService;
this.blindVoteValidator = blindVoteValidator;
this.periodService = periodService;
this.myVoteListService = myVoteListService;
this.bsqWalletService = bsqWalletService;
this.btcWalletService = btcWalletService;
this.p2PService = p2PService;
this.walletsManager = walletsManager;

bsqNode = bsqNodeProvider.getBsqNode();
}


Expand All @@ -130,7 +132,7 @@ public void addListeners() {

@Override
public void start() {
maybeRevealVotes(daoStateService.getChainHeight());
maybeRevealVotes();
}


Expand All @@ -151,7 +153,8 @@ public byte[] getHashOfBlindVoteList() {
@Override
public void onNewBlockHeight(int blockHeight) {
// TODO check if we should use onParseTxsComplete for calling maybeCalculateVoteResult
maybeRevealVotes(blockHeight);

maybeRevealVotes();
}

@Override
Expand All @@ -172,7 +175,13 @@ public void onParseBlockChainComplete() {
// the blind vote was created in case we have not done it already.
// The voter need to be at least once online in the reveal phase when he has a blind vote created,
// otherwise his vote becomes invalid and his locked stake will get unlocked
private void maybeRevealVotes(int chainHeight) {
private void maybeRevealVotes() {
// We must not use daoStateService.getChainHeight() because that gets updated with each parsed block but we
// only want to publish the vote reveal tx if our current real chain height is matching the cycle and phase and
// not at any intermediate height during parsing all blocks. The bsqNode knows the latest height from either
// Bitcoin Core or from the seed node.
int chainHeight = bsqNode.getChainTipHeight();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a feeling that we might want to wait to publish until we've parsed the chain up until chainTipHeight instead of publishing before we're done parsing. I don't have a concrete example, but publishing before knowing the actual current state seems like it could lead to more trouble. Maybe it would invalidate some BSQ, or maybe it would just burn some to fees.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The onNewBlockHeight is called before the parsing of the block. So at the first block of the reveal phase we create and publish the tx. In the next block it will be validated and added to to the DaoState. So we could not wait for parsing until it is not published.


if (periodService.getPhaseForHeight(chainHeight) == DaoPhase.Phase.VOTE_REVEAL) {
myVoteListService.getMyVoteList().stream()
.filter(myVote -> myVote.getRevealTxId() == null) // we have not already revealed TODO
Expand Down