<p>The <code>CoreTradesService</code> was also refactored to work with the api methods implemented in this PR:</p>
<ul>
<li>
<p><code>keepfunds</code> -- Close trade, keep funds in Bisq wallet</p>
</li>
<li>
<p><code>withdrawfunds</code> -- Close trade, withdraw funds to external BTC wallet</p>
</li>
</ul>
<p>A <code>getKey</code> accessor was added to <code>CoreWalletsService</code> (needed by withdrawfunds impl).</p>
<p>PR <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="729896071" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/4709" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/4709/hovercard" href="https://github.com/bisq-network/bisq/pull/4709">#4709</a> should be reviewed & merged before this PR.</p>
<hr>
<h4>You can view, comment on, or merge this pull request online at:</h4>
<p> <a href='https://github.com/bisq-network/bisq/pull/4711'>https://github.com/bisq-network/bisq/pull/4711</a></p>
<h4>Commit Summary</h4>
<ul>
<li>Block on tx-fee-request in core TakeOfferModel init</li>
<li>Add compiler warning suppression, remove comment</li>
<li>Add fields to grpc TradeInfo proto & wrapper</li>
<li>Replace static TradeUtil with singleton TradeUtil</li>
<li>Fix comment typos</li>
<li>Refactor PendingTradesViewModel methods -> TradeUtil & OfferUtil</li>
<li>Remove trailing spaces for codacy</li>
<li>Refactor PendingTradesDataModel methods -> TradeUtil</li>
<li>Remove unused import</li>
<li>Add getRole(tradeId) to core api</li>
<li>Refactor CLI output formatting code & add trade formatter</li>
<li>Add license comment</li>
<li>Move semicolon up from blank line</li>
<li>Add 'gettrade' to api method CLI</li>
<li>Add boolean 'showcontract' argument to api's 'gettrade'</li>
<li>Stub out api methods 'keepfunds', 'withdrawfunds'</li>
<li>Implement api methods 'keepfunds', 'withdrawfunds'</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-c41ca392649706fed19bf13247aeab25d0aa4ec109c93691aa2e7839b0fea70d">apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java</a>
(1)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-80fde285109a91d7581e771828393b6c87ac3b2a7e7de6ee750e7d41e594650a">apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-0a94ee487ea9d0b7b440b8688f6e9df897fd089fc84ead5f6cc9ca9453ad3b21">apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java</a>
(7)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-afc5db1c8acb08dec253ee87a3e0e677c932d6826a2ab4c31ba816a4dcfb1386">cli/src/main/java/bisq/cli/CliMain.java</a>
(54)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-9687777eeb1474070ca4255e431cc57c81fd0988ae088aaaf980aa7600f21b9d">cli/src/main/java/bisq/cli/ColumnHeaderConstants.java</a>
(55)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-2ac1e865aee578e0d675f0b5777c3c9ba660b165166cb7b031539face84c8559">cli/src/main/java/bisq/cli/TableFormat.java</a>
(26)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-dd71b2d8988605f241ad97f535ee27c5a5fc9da4f14baa400e4739375db5fe46">cli/src/main/java/bisq/cli/TradeFormat.java</a>
(118)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-fb5876d3b212d239a14d78529ac498b30a2dbb8e3f184ba9bd711a5d4901fb62">core/src/main/java/bisq/core/api/CoreApi.java</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-7ab5c96db69bcc7ca05627ada97fd93b423f7df355641a7cd371d31f2039baf9">core/src/main/java/bisq/core/api/CoreTradesService.java</a>
(129)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-f1df4fd99db45d9b91ec2a59f443619324e243cb5738a597ef8008b67cc97d9a">core/src/main/java/bisq/core/api/CoreWalletsService.java</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-3a9ff7695726e0660444b5b5e18600d2cff2bc2fcdf3f78c36a0fc3df504e1b6">core/src/main/java/bisq/core/api/model/OfferInfo.java</a>
(8)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-5751067b75ae6f7739df840d815386f3998f04baff5de96c079f5ce1fe6b4f57">core/src/main/java/bisq/core/api/model/TradeInfo.java</a>
(148)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-b604ee7141fcfacf2dd0aeade4bf393c4d4d93617ab327147c363539ae804496">core/src/main/java/bisq/core/offer/OfferUtil.java</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-c19acb59c56bd6f03db8b9eaa772119ec8cd05b64d6a6aa86fb53f5338cf1122">core/src/main/java/bisq/core/offer/takeoffer/TakeOfferModel.java</a>
(38)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-4c53004633c87a847cb5cb8296acfcff56882b3c4c502b9ee8d16ca3d81881cb">core/src/main/java/bisq/core/trade/TradeManager.java</a>
(5)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-90839a4e0c5fc8b748e288ff7efc11d862e7ef82691c15eb00b60be56c1af7ec">core/src/main/java/bisq/core/trade/TradeUtil.java</a>
(228)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-9c09684987dfae9f6cd0bc832ee7c5264339c0a571155b8a2b72f376f3b58608">core/src/main/java/bisq/core/trade/TradeUtils.java</a>
(79)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-72487d9cf0255fc80f6eba13356e3212033a31088cc341022ab7f5bf6147be18">core/src/main/java/bisq/core/trade/failed/FailedTradesManager.java</a>
(7)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-0999abe6a76f18c5be810b6c5436cea6d708c11d99ed316d0397c3ebbc6aa777">daemon/src/main/java/bisq/daemon/grpc/GrpcTradesService.java</a>
(37)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-9ec8e04828ae4eced641f0fb13a739df09a8e0dbb3ec809278f1e2a89f8d4a10">desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java</a>
(83)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-48b9ff1bdc7f59edec943ad00b56b091cf34548046ea14b2aff0b2e32a6d67b7">desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java</a>
(110)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4711/files#diff-dcb44a0045a5b02cde5bd2f45051b7d9293f87180111c7ea57f0d0eb85d0f393">proto/src/main/proto/grpc.proto</a>
(49)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/bisq-network/bisq/pull/4711.patch'>https://github.com/bisq-network/bisq/pull/4711.patch</a></li>
<li><a href='https://github.com/bisq-network/bisq/pull/4711.diff'>https://github.com/bisq-network/bisq/pull/4711.diff</a></li>
</ul>
<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/4711">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNQVH6XRAE4HXDUHUQDSMYDMRANCNFSM4TACBNKQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNVKWPWEHLBPOSGYFALSMYDMRA5CNFSM4TACBNK2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4K4CXCKQ.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/4711",
"url": "https://github.com/bisq-network/bisq/pull/4711",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>