<p></p>
<p><b>@sqrrm</b> commented on this pull request.</p>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/5357#discussion_r606269011">cli/src/main/java/bisq/cli/TradeFormat.java</a>:</p>
<pre style='color:#555'>> @@ -181,4 +190,32 @@ private static String formatTradeData(String format,
t.getOffer().getBaseCurrencyCode().equals("BTC")
? formatOfferVolume(t.getOffer().getVolume())
: formatSatoshis(t.getTradeAmountAsLong());
+
+ private static final BiFunction<TradeInfo, Boolean, String> bsqReceiveAddress = (t, showBsqBuyerAddress) -> {
+ if (showBsqBuyerAddress) {
+ ContractInfo contract = t.getContract();
+ boolean isBuyerMakerAndSellerTaker = contract.getIsBuyerMakerAndSellerTaker();
+ return isBuyerMakerAndSellerTaker // (is BTC buyer / maker)
+ ? contract.getTakerPaymentAccountPayload().getAddress()
+ : contract.getMakerPaymentAccountPayload().getAddress();
+ } else {
+ return "";
+ }
+ };
+
+ private static boolean shouldShowBqsBuyerAddress(TradeInfo tradeInfo, boolean isTaker) {
</pre>
<p>Spelling <code>...Bqs...</code></p>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/5357#discussion_r606271676">core/src/main/java/bisq/core/api/CoreWalletsService.java</a>:</p>
<pre style='color:#555'>> @@ -305,6 +312,41 @@ void sendBtc(String address,
}
}
+ boolean verifyBsqSentToAddress(String address, String amount) {
</pre>
<p>There are some issues with this as two trades could have the same amounts, or someone sends the BSQ as two transactions adding up to the total amount. I think this is good enough for now, but it's not fool proof. The problem is the same when trading manually though, just something to keep in mind.</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/5357#pullrequestreview-627023763">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNUBBY4ONKBKAHA4HO3TGXNRJANCNFSM4Z2HXPAQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNR5L3APDFJRK6YBKCDTGXNRJA5CNFSM4Z2HXPA2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOEVPZ7EY.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/5357#pullrequestreview-627023763",
"url": "https://github.com/bisq-network/bisq/pull/5357#pullrequestreview-627023763",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>