<p></p>
<blockquote>
<p>It appears the only difference between <code>CoreWalletService</code> on current master and the <a href="https://github.com/bisq-network/bisq/commit/de8213a95d3e9334a48e7c8f937f7b11b7796afa">de8213a</a> version I rebased off is a few lines calling <code>feeService.getMinFeePerVByte()</code>, in place of the hard coded fee <code>BTC_DAO_REGTEST.getDefaultMinFeePerVbyte()</code>. But I don't think those lines conflict (textually or otherwise) with the changes from this PR, so they shouldn't be inadvertently reverted as a result of merging this PR.</p>
</blockquote>
<p>That  <code>CoreWalletService</code> diff is related to other changes in <code>grpc.proto</code> , <code>TxFeeRateInfo</code> (a proto wrapper), etc.  If you can successfully merge, I think I can easily re-add those changes.   I am concerned about other recent api changes to master being overwritten;  I can review after a successful merging of this PR.</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#issuecomment-827630428">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNRKDFSA73CRKGROTOLTK27UDANCNFSM4WP4XQZQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNWSRAKHTCOX2JQ3TFLTK27UDA5CNFSM4WP4XQZ2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOGFKKGXA.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#issuecomment-827630428",
"url": "https://github.com/bisq-network/bisq/pull/5109#issuecomment-827630428",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>