<p></p>
<p><b>@chimp1984</b> approved this pull request.</p>

<p>utACK</p>
<p>Looks all good to me.</p>
<p>The Base58AddressValidator is still used in MockTestnetCoin. I think that can be replaced with BitcoinAddressValidator now.</p><hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/5109#discussion_r566411179">core/src/main/java/bisq/core/app/BisqSetup.java</a>:</p>
<pre style='color:#555'>> @@ -416,7 +416,9 @@ private void initWallet() {
                 requestWalletPasswordHandler.accept(aesKey -> {
                     walletsManager.setAesKey(aesKey);
                     walletsSetup.getWalletConfig().maybeAddSegwitKeychain(walletsSetup.getWalletConfig().btcWallet(),
-                            aesKey);
+                            aesKey, false);
+                    walletsSetup.getWalletConfig().maybeAddSegwitKeychain(walletsSetup.getWalletConfig().bsqWallet(),
</pre>
<p>Maybe we can handle that in walletsManager, which is used for operations which should be applied to both wallets, so it is closer to the wallet domain.</p>

<hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/5109#discussion_r566417247">core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java</a>:</p>
<pre style='color:#555'>>          return getUnusedAddress();
     }
 
-    public LegacyAddress getUnusedAddress() {
-        return (LegacyAddress) wallet.getIssuedReceiveAddresses().stream()
+    public Address getUnusedAddress() {
+        return wallet.getIssuedReceiveAddresses().stream()
+                .filter(address -> Script.ScriptType.P2WPKH.equals(address.getOutputScriptType()))
</pre>
<p>So we enforce a new segwit address in case a unused legacy address would be available. Just want to double check that this was your intention. I agree that this makes sense so no old dangling legacy addresses will be used.</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/5109#pullrequestreview-578746098">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNUKGIJKKNLHMLZKAPTS4HKV3ANCNFSM4WP4XQZQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNTEEEI4HU76KAXJC63S4HKV3A5CNFSM4WP4XQZ2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOEJ7PN4Q.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/5109#pullrequestreview-578746098",
"url": "https://github.com/bisq-network/bisq/pull/5109#pullrequestreview-578746098",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>