Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Dispute agents sign summary #4517

Closed
wants to merge 13 commits into from
Closed

[WIP] Dispute agents sign summary #4517

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4f1cbbd
Add check for refund agent if donation address is valid
chimp1984 Sep 11, 2020
2b04338
Dont allow opening refudn agent dispute if delayed payout tx is invalid.
chimp1984 Sep 11, 2020
c48abbf
Improve address validation code
chimp1984 Sep 11, 2020
d82631f
Fix some issues found during testing
chimp1984 Sep 12, 2020
677211b
Allow close dispute for refund agent without payout
chimp1984 Sep 12, 2020
08fb596
Call validatePayoutTx only after trades are initialized
chimp1984 Sep 12, 2020
7ac6e71
Dispute agent sign summary. Add tool for verification
chimp1984 Sep 12, 2020
559028e
Remove unused var
chimp1984 Sep 12, 2020
48066ae
Remove setting of pubKey as it is not needed
chimp1984 Sep 12, 2020
0c46e7d
Add more data to summary msg
chimp1984 Sep 12, 2020
de4fb17
Improve summary notes
chimp1984 Sep 13, 2020
966b22a
Fix line breaks
chimp1984 Sep 13, 2020
b0b4334
Merge branch 'master_upstream' into dispute-agents-sign-summary
chimp1984 Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions core/src/main/resources/i18n/displayStrings.properties
View file
Open in desktop
Expand Up @@ -2459,12 +2459,15 @@ disputeSummaryWindow.reason.TRADE_ALREADY_SETTLED=Trade already settled
disputeSummaryWindow.summaryNotes=Summary notes
disputeSummaryWindow.addSummaryNotes=Add summary notes
disputeSummaryWindow.close.button=Close ticket
disputeSummaryWindow.close.msg=Ticket closed on {0}\n\n\
Summary:\n\
Payout amount for BTC buyer: {1}\n\
Payout amount for BTC seller: {2}\n\n\
Reason for dispute: {3}\n\n\
Summary notes:\n{4}
disputeSummaryWindow.close.msg=Ticket for trade {0} closed on {1}\n\
{2} node address: {3}\n\n\
Summary:\n\
Traded currency: {4}\n\
Trade amount: {5}\n\
Payout amount for BTC buyer: {6}\n\
Payout amount for BTC seller: {7}\n\n\
Reason for dispute: {8}\n\n\
Summary notes:\n{9}

disputeSummaryWindow.close.msgWithSigAndPubKey={0}{1}\
Signer node address: {2}\n\
Expand Down
25 changes: 25 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java
View file
Open in desktop
Expand Up @@ -803,8 +803,33 @@ private void doClose(Button closeTicketButton) {
dispute.setIsClosed(true);
DisputeResult.Reason reason = disputeResult.getReason();

/* disputeSummaryWindow.close.msg=Ticket for trade {0} closed on {1}\n\n\
{2} node address: {3}\n\
Summary:\n\
Payout amount for BTC buyer: {4}\n\
Payout amount for BTC seller: {5}\n\n\
Reason for dispute: {6}\n\n\
Summary notes:\n{7}
.append("Currency: ")
.append(CurrencyUtil.getNameAndCode(contract.getOfferPayload().getCurrencyCode()))
.append("\n")
.append("Trade amount: ")
.append(contract.getTradeAmount().toFriendlyString())


*/
String role = isRefundAgent ? Res.get("shared.refundAgent") : Res.get("shared.mediator");
String agentNodeAddress = checkNotNull(disputeManager.getAgentNodeAddress(dispute)).getFullAddress();
Contract contract = dispute.getContract();
String currencyCode = contract.getOfferPayload().getCurrencyCode();
String amount = formatter.formatCoinWithCode(contract.getTradeAmount());
String textToSign = Res.get("disputeSummaryWindow.close.msg",
dispute.getShortTradeId(),
DisplayUtils.formatDateTime(disputeResult.getCloseDate()),
role,
agentNodeAddress,
currencyCode,
amount,
formatter.formatCoinWithCode(disputeResult.getBuyerPayoutAmount()),
formatter.formatCoinWithCode(disputeResult.getSellerPayoutAmount()),
Res.get("disputeSummaryWindow.reason." + reason.name()),
Expand Down