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

<p>ACK</p><hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/1851#discussion_r230118944">core/src/main/java/bisq/core/dao/state/DaoStateService.java</a>:</p>
<pre style='color:#555'>> @@ -646,6 +646,10 @@ public boolean isLockupOutput(TxOutput txOutput) {
                 .findFirst());
     }
 
+    public Optional<TxOutput> getLockupOpReturnTxOutput(String txId) {
</pre>
<p>Perhaps a check to make there is actually an opreturn output would be good</p>

<hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/1851#discussion_r230123682">desktop/src/main/java/bisq/desktop/main/dao/bonding/unlock/LockupTxListItem.java</a>:</p>
<pre style='color:#555'>> @@ -88,7 +99,18 @@
     }
 
     public boolean isLockupAndUnspent() {
-        return !isSpent() && getTxType() == TxType.LOCKUP;
+        boolean isLocked;
</pre>
<p>I've tried to avoid using 'locked' as a key word, it's not entirely clear. Better to use 'lockup', 'unlocking', 'unlocked' or more specific words for clarity.</p>

<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/1851#pullrequestreview-170783176">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AkpZtvi9w1uSbeDnKUBiyq-Z48aQECsMks5uqzfRgaJpZM4YFh1i">mute the thread</a>.<img src="https://github.com/notifications/beacon/AkpZtsIe5dCenu6CBB1EG6Rm6ybDqNb6ks5uqzfRgaJpZM4YFh1i.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://assets-cdn.github.com/images/email/message_cards/header.png","avatar_image_url":"https://assets-cdn.github.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 #1851"}],"action":{"name":"View Pull Request","url":"https://github.com/bisq-network/bisq/pull/1851#pullrequestreview-170783176"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/1851#pullrequestreview-170783176",
"url": "https://github.com/bisq-network/bisq/pull/1851#pullrequestreview-170783176",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
},
{
"@type": "MessageCard",
"@context": "http://schema.org/extensions",
"hideOriginalBody": "false",
"originator": "AF6C5A86-E920-430C-9C59-A73278B5EFEB",
"title": "@sqrrm commented on 1851",
"sections": [
{
"text": "ACK",
"activityTitle": "**sqrrm**",
"activityImage": "https://assets-cdn.github.com/images/email/message_cards/avatar.png",
"activitySubtitle": "@sqrrm",
"facts": [

]
}
],
"potentialAction": [
{
"targets": [
{
"os": "default",
"uri": "https://github.com/bisq-network/bisq/pull/1851#pullrequestreview-170783176"
}
],
"@type": "OpenUri",
"name": "View on GitHub"
},
{
"name": "Unsubscribe",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"MuteNotification\",\n\"threadId\": 404102498\n}"
}
],
"themeColor": "26292E"
}
]</script>