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.

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

Add signature to dispute result and various other improvements #4543

Merged
merged 42 commits into from Sep 25, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 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
05e1039
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
29f3a7c
Merge branch 'master_upstream' into allow-refund-agent-close-without-…
chimp1984 Sep 17, 2020
b0b4334
Merge branch 'master_upstream' into dispute-agents-sign-summary
chimp1984 Sep 17, 2020
1c0bef7
Merge branch 'master_upstream' into verify-donation-address-for-refun…
chimp1984 Sep 17, 2020
1c41db4
Fix wrong handling of mainnet RECIPIENT_BTC_ADDRESSes
chimp1984 Sep 17, 2020
3d4427c
Add result of filter match. Add more filter data (tx ids, json)
chimp1984 Sep 17, 2020
45cee2a
Add check for disputes with duplicated trade ID or payout tx ids
chimp1984 Sep 18, 2020
f46a991
Merge branch 'dispute-agents-sign-summary' into dispute-agent-branch
chimp1984 Sep 18, 2020
b2a9262
Merge branch 'verify-donation-address-for-refund-agent' into dispute-…
chimp1984 Sep 18, 2020
c1850cb
Merge branch 'master_upstream' into dispute-agent-branch
chimp1984 Sep 20, 2020
3293047
Set agentsUid to new uuid in case it is null from persisted data
chimp1984 Sep 20, 2020
d31deff
Remove dev log
chimp1984 Sep 20, 2020
25bc616
Add check for multiple deposit txs
chimp1984 Sep 20, 2020
4878a10
Optimize testIfDisputeTriesReplay methods to avoid that maps get crea…
chimp1984 Sep 20, 2020
c6778d6
Add copy to csv data button to report screen
chimp1984 Sep 21, 2020
72dca0b
Add cylce index
chimp1984 Sep 21, 2020
2943316
Remove agentsUid from protobuf, rename to uid
chimp1984 Sep 21, 2020
30e9add
Refactor: rename DelayedPayoutTxValidation to TradeDataValidation
chimp1984 Sep 21, 2020
3206c62
Refactor: Move RegexValidator from bisq.desktop.util.validation to bi…
chimp1984 Sep 21, 2020
987bf49
Add node address validation
chimp1984 Sep 21, 2020
baa915f
Add validateNodeAddress at onOpenNewDisputeMessage
chimp1984 Sep 21, 2020
d52199e
Merge branch 'refactor-regexvalidator' into dispute-agent-branch
chimp1984 Sep 21, 2020
c7a3f95
Rename filterString to filterTerm
chimp1984 Sep 21, 2020
76c8263
Ignore onion address validation for localhost
chimp1984 Sep 21, 2020
a9f1062
Move validation after adding dispute to list
chimp1984 Sep 21, 2020
81bea14
Show popup to peer who accepted mediators suggestion once locktime is…
chimp1984 Sep 21, 2020
f37446b
Change log level
chimp1984 Sep 25, 2020
8ac468d
Commit to trigger travis as it got stuck...
chimp1984 Sep 25, 2020
25c4b4d
Merge branch 'master_upstream' into dispute-agent-branch
chimp1984 Sep 25, 2020
423cc71
Add changes from merge conflict (class was renamed)
chimp1984 Sep 25, 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
24 changes: 12 additions & 12 deletions core/src/main/java/bisq/core/support/dispute/DisputeManager.java
Expand Up @@ -317,18 +317,6 @@ protected void onOpenNewDisputeMessage(OpenNewDisputeMessage openNewDisputeMessa
Contract contract = dispute.getContract();
addPriceInfoMessage(dispute, 0);

try {
TradeDataValidation.validateDonationAddress(dispute.getDonationAddressOfDelayedPayoutTx(), daoFacade);
TradeDataValidation.testIfDisputeTriesReplay(dispute, disputeList.getList());
TradeDataValidation.validateNodeAddress(dispute, dispute.getContract().getBuyerNodeAddress(), config);
TradeDataValidation.validateNodeAddress(dispute, dispute.getContract().getSellerNodeAddress(), config);
} catch (TradeDataValidation.AddressException |
TradeDataValidation.DisputeReplayException |
TradeDataValidation.NodeAddressException e) {
log.error(e.toString());
validationExceptions.add(e);
}

PubKeyRing peersPubKeyRing = dispute.isDisputeOpenerIsBuyer() ? contract.getSellerPubKeyRing() : contract.getBuyerPubKeyRing();
if (isAgent(dispute)) {
if (!disputeList.contains(dispute)) {
Expand Down Expand Up @@ -359,6 +347,18 @@ protected void onOpenNewDisputeMessage(OpenNewDisputeMessage openNewDisputeMessa
}

addMediationResultMessage(dispute);

try {
TradeDataValidation.validateDonationAddress(dispute.getDonationAddressOfDelayedPayoutTx(), daoFacade);
TradeDataValidation.testIfDisputeTriesReplay(dispute, disputeList.getList());
TradeDataValidation.validateNodeAddress(dispute, dispute.getContract().getBuyerNodeAddress(), config);
TradeDataValidation.validateNodeAddress(dispute, dispute.getContract().getSellerNodeAddress(), config);
} catch (TradeDataValidation.AddressException |
TradeDataValidation.DisputeReplayException |
TradeDataValidation.NodeAddressException e) {
log.error(e.toString());
validationExceptions.add(e);
}
}

// Not-dispute-requester receives that msg from dispute agent
Expand Down
Expand Up @@ -733,7 +733,6 @@ private void doPayout(Coin buyerPayoutAmount,
fee,
buyerPayoutAddressString,
sellerPayoutAddressString);
log.error("transaction " + tx);
tradeWalletService.broadcastTx(tx, new TxBroadcaster.Callback() {
@Override
public void onSuccess(Transaction transaction) {
Expand Down