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

<p>Tested in regtest and wallet conversion seems to have worked fine. Sending coins work fine, BSQ parsing looks correct.</p>
<p>What I haven't done is completely understood the changes to WalletConfig.java. The rest looks ok to me.</p><hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/4504#discussion_r490112807">core/src/main/java/bisq/core/btc/model/AddressEntryList.java</a>:</p>
<pre style='color:#555'>> @@ -105,9 +107,9 @@ public void onWalletReady(Wallet wallet) {
         if (!entrySet.isEmpty()) {
             Set<AddressEntry> toBeRemoved = new HashSet<>();
             entrySet.forEach(addressEntry -> {
-                DeterministicKey keyFromPubHash = (DeterministicKey) wallet.findKeyFromPubHash(addressEntry.getPubKeyHash());
+                DeterministicKey keyFromPubHash = (DeterministicKey) wallet.findKeyFromPubKeyHash(addressEntry.getPubKeyHash(), Script.ScriptType.P2PKH);
</pre>
<p>Prefer to break lines at 120 characters.</p>

<hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/4504#discussion_r490177317">gradle/witness/gradle-witness.gradle</a>:</p>
<pre style='color:#555'>> @@ -68,22 +68,23 @@ dependencyVerification {
         'net.glxn:qrgen:c85d9d8512d91e8ad11fe56259a7825bd50ce0245447e236cf168d1b17591882',
         'net.jcip:jcip-annotations:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
         'net.sf.jopt-simple:jopt-simple:df26cc58f235f477db07f753ba5a3ab243ebe5789d9f89ecf68dd62ea9a66c28',
-        'network.bisq.btcd-cli4j:btcd-cli4j-core:203156fc63dc1202774de9818e4f21149549f79b25d356b08bb0c784be40c0e8',
-        'network.bisq.btcd-cli4j:btcd-cli4j-daemon:0a2783a851add6e3d8ae899ade48c041b250bfac64b6a4c5f6380ebcdbbe6848',
+        'network.bisq.btcd-cli4j:btcd-cli4j-core:4634b39de93764c4609e295e254e8c3b1427ba24febf43352f4f315029c5b1b3',
</pre>
<p>Upgraded btcd-cli4j, why was this necessary?</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/4504#pullrequestreview-490422477">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNSR3AMRHMVZJ3MROTLSGH2RDANCNFSM4RAV7MIQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNRGEMSKXJAPLHYKCWDSGH2RDA5CNFSM4RAV7MI2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGODU5UBTI.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/4504#pullrequestreview-490422477",
"url": "https://github.com/bisq-network/bisq/pull/4504#pullrequestreview-490422477",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>