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

Fix missing removal of old or invalid proposals #2377

Merged
merged 2 commits into from
Feb 11, 2019
Merged

Fix missing removal of old or invalid proposals #2377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc362c7
Fix missing removal of old or invalid proposals
ManfredKarrer Feb 5, 2019
df0a8b7
Remove duplicate log
ManfredKarrer Feb 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
19 changes: 12 additions & 7 deletions core/src/main/java/bisq/core/dao/governance/proposal/ProposalService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,18 +239,23 @@ private void onProtectedDataRemoved(ProtectedStorageEntry entry) {
if (protectedStoragePayload instanceof TempProposalPayload) {
Proposal proposal = ((TempProposalPayload) protectedStoragePayload).getProposal();
// We allow removal only if we are in the proposal phase.
if (periodService.isInPhase(daoStateService.getChainHeight(), DaoPhase.Phase.PROPOSAL)) {
boolean inPhase = periodService.isInPhase(daoStateService.getChainHeight(), DaoPhase.Phase.PROPOSAL);
boolean txInPastCycle = periodService.isTxInPastCycle(proposal.getTxId(), daoStateService.getChainHeight());
Optional<Tx> tx = daoStateService.getTx(proposal.getTxId());
boolean unconfirmedOrNonBsqTx = !tx.isPresent();
// if the tx is unconfirmed we need to be in the PROPOSAL phase, otherwise the tx must be confirmed.
if (inPhase || txInPastCycle || unconfirmedOrNonBsqTx) {
if (tempProposals.contains(proposal)) {
log.info("We received a remove request for a TempProposalPayload and have removed the proposal " +
"from our list. proposalTxId={}", proposal.getTxId());
tempProposals.remove(proposal);
log.info("We received a remove request for a TempProposalPayload and have removed the proposal " +
"from our list. proposal creation date={}, proposalTxId={}, inPhase={}, " +
"txInPastCycle={}, unconfirmedOrNonBsqTx={}",
proposal.getCreationDate(), proposal.getTxId(), inPhase, txInPastCycle, unconfirmedOrNonBsqTx);
}
} else {
Optional<Tx> tx = daoStateService.getTx(proposal.getTxId());
log.warn("We received a remove request outside the PROPOSAL phase. " +
"Proposal.txId={}, current blockHeight={}, tx blockHeight={}, proposal creation date={}",
proposal.getTxId(), daoStateService.getChainHeight(),
tx.isPresent() ? tx.get().getBlockHeight() : "null", proposal.getCreationDate());
"Proposal creation date={}, proposal.txId={}, current blockHeight={}",
proposal.getCreationDate(), proposal.getTxId(), daoStateService.getChainHeight());
}
}
}
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -242,7 +242,6 @@ private void revealVote(MyVote myVote, boolean inBlindVotePhase) {
// If we are not in the right phase we just add an empty hash (still need to have the hash as otherwise we
// would not recognize the tx as vote reveal tx)
byte[] hashOfBlindVoteList = inBlindVotePhase ? getHashOfBlindVoteList() : new byte[20];
log.info("revealVote: Sha256Ripemd160 hash of hashOfBlindVoteList " + Utilities.bytesAsHexString(hashOfBlindVoteList));
byte[] opReturnData = VoteRevealConsensus.getOpReturnData(hashOfBlindVoteList, myVote.getSecretKey());

// We search for my unspent stake output.
Expand Down