<p><b>@sqrrm</b> commented on this pull request.</p>

<hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/2587#discussion_r270100729">core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java</a>:</p>
<pre style='color:#555'>>                          // We clone the ballot instead applying the vote to the existing ballot from ballotListService
                         // The items from ballotListService.getBallotList() contains my votes.
-                        // Maybe we should cross verify if the vote we had in our local list matches my own vote we
-                        // received from the network?
-                        return new Ballot(ballot.getProposal(), vote);
+
+                        if (ballot.getVote() != null) {
+                            // If we had set a vote it was an own active vote
+                            if (!entry.getValue().isPresent()) {
+                                log.warn("We found a local vote but don't have that vote in the data from the " +
+                                        "blind vote. ballot={}", ballot);
+                            }
+                            if (ballot.getVote() != entry.getValue().get()) {
</pre>
<p>This needs to be an <code>else if</code>, <code>entry.getValue()</code> is checked in the previous <code>if</code>but code execution continues.</p>

<hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/2587#discussion_r270101511">core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java</a>:</p>
<pre style='color:#555'>> -                        return new Ballot(ballot.getProposal(), vote);
+
+                        if (ballot.getVote() != null) {
+                            // If we had set a vote it was an own active vote
+                            if (!entry.getValue().isPresent()) {
+                                log.warn("We found a local vote but don't have that vote in the data from the " +
+                                        "blind vote. ballot={}", ballot);
+                            }
+                            if (ballot.getVote() != entry.getValue().get()) {
+                                log.warn("We found a local vote but the vote from the " +
+                                                "blind vote does not match. ballot={}, vote from blindVote data={}",
+                                        ballot, entry.getValue().get());
+                            }
+                        }
+
+                        // We only return accpeted or rejected votes
</pre>
⬇️ Suggested change
<pre style="color: #555">-                        // We only return accpeted or rejected votes
+                        // We only return accepted or rejected votes
</pre>


<hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/2587#discussion_r270103636">core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java</a>:</p>
<pre style='color:#555'>> @@ -396,6 +413,17 @@ private BallotList createBallotList(VoteWithProposalTxIdList voteWithProposalTxI
         if (!missingBallots.isEmpty())
             throw new VoteResultException.MissingBallotException(ballots, missingBallots);
 
+        // If we received a proposal after we had already voted we consider it as an proposla withhold attack and
</pre>
⬇️ Suggested change
<pre style="color: #555">-        // If we received a proposal after we had already voted we consider it as an proposla withhold attack and
+        // If we received a proposal after we had already voted we consider it as an proposal withhold attack and
</pre>


<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/bisq-network/bisq/pull/2587#pullrequestreview-220148159">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AkpZtpKPnXZFCOVxEFo77Evym3u9O6qaks5vbPYQgaJpZM4cKo_c">mute the thread</a>.<img src="https://github.com/notifications/beacon/AkpZtkgqLDxzw_FUFv4owm72M_6dZVfzks5vbPYQgaJpZM4cKo_c.gif" height="1" width="1" alt="" /></p>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/bisq-network/bisq","title":"bisq-network/bisq","subtitle":"GitHub repository","main_image_url":"https://github.githubassets.com/images/email/message_cards/header.png","avatar_image_url":"https://github.githubassets.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/bisq-network/bisq"}},"updates":{"snippets":[{"icon":"PERSON","message":"@sqrrm commented on #2587"}],"action":{"name":"View Pull Request","url":"https://github.com/bisq-network/bisq/pull/2587#pullrequestreview-220148159"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/2587#pullrequestreview-220148159",
"url": "https://github.com/bisq-network/bisq/pull/2587#pullrequestreview-220148159",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>