mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

When a refund agent closes a case we have checked that the trade protocol is the same between offer and refund agent.

Browse source 
This would fail once we update trade protocol version when we release segwit. So this fixes that as it only checks if the version is not the old version (1) where refund agents have not been part of the system.
Also checks for legacy arbitrator that it only can be used for version 1 cases. Not tested and not assumed that this code will be executed as old arbitrators would use the old app in case they need to still work on a old case.
This commit is contained in:
chimp1984 2020-10-10 15:55:19 -05:00
parent 18a8a14114
commit 608166ce64
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
4 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java
View file

@ -55,7 +55,6 @@ import bisq.core.util.coin.CoinFormatter;
import bisq.network.p2p.NodeAddress;
import bisq.common.app.Version;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.PubKeyRing;
import bisq.common.util.Utilities;
@ -475,15 +474,7 @@ public abstract class DisputeView extends ActivatableView<VBox, Void> {
protected abstract void handleOnSelectDispute(Dispute dispute);
protected void onCloseDispute(Dispute dispute) {
long protocolVersion = dispute.getContract().getOfferPayload().getProtocolVersion();
if (protocolVersion == Version.TRADE_PROTOCOL_VERSION) {
disputeSummaryWindow.onFinalizeDispute(() -> chatView.removeInputBox())
.show(dispute);
} else {
new Popup().warning(Res.get("support.wrongVersion", protocolVersion)).show();
}
}
protected abstract void onCloseDispute(Dispute dispute);
protected void reOpenDispute() {
if (selectedDispute != null) {

15
desktop/src/main/java/bisq/desktop/main/support/dispute/agent/arbitration/ArbitratorView.java
View file

@ -18,6 +18,7 @@
package bisq.desktop.main.support.dispute.agent.arbitration;
import bisq.desktop.common.view.FxmlView;
import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.main.overlays.windows.ContractWindow;
import bisq.desktop.main.overlays.windows.DisputeSummaryWindow;
import bisq.desktop.main.overlays.windows.TradeDetailsWindow;
@ -26,6 +27,7 @@ import bisq.desktop.main.support.dispute.agent.DisputeAgentView;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.alert.PrivateNotificationManager;
import bisq.core.dao.DaoFacade;
import bisq.core.locale.Res;
import bisq.core.support.SupportType;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeSession;
@ -84,4 +86,17 @@ public class ArbitratorView extends DisputeAgentView {
protected DisputeSession getConcreteDisputeChatSession(Dispute dispute) {
return new ArbitrationSession(dispute, disputeManager.isTrader(dispute));
}
@Override
protected void onCloseDispute(Dispute dispute) {
long protocolVersion = dispute.getContract().getOfferPayload().getProtocolVersion();
// Only cases with protocolVersion 1 are candidates for legacy arbitration.
// This code path is not tested and it is not assumed that it is still be used as old arbitrators would use
// their old Bisq version if sill cases are pending.
if (protocolVersion == 1) {
disputeSummaryWindow.onFinalizeDispute(() -> chatView.removeInputBox()).show(dispute);
} else {
new Popup().warning(Res.get("support.wrongVersion", protocolVersion)).show();
}
}
}

3
desktop/src/main/java/bisq/desktop/main/support/dispute/agent/mediation/MediatorView.java
View file

@ -112,7 +112,6 @@ public class MediatorView extends DisputeAgentView {
@Override
protected void onCloseDispute(Dispute dispute) {
disputeSummaryWindow.onFinalizeDispute(() -> chatView.removeInputBox())
.show(dispute);
disputeSummaryWindow.onFinalizeDispute(() -> chatView.removeInputBox()).show(dispute);
}
}

13
desktop/src/main/java/bisq/desktop/main/support/dispute/agent/refund/RefundAgentView.java
View file

@ -18,6 +18,7 @@
package bisq.desktop.main.support.dispute.agent.refund;
import bisq.desktop.common.view.FxmlView;
import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.main.overlays.windows.ContractWindow;
import bisq.desktop.main.overlays.windows.DisputeSummaryWindow;
import bisq.desktop.main.overlays.windows.TradeDetailsWindow;
@ -26,6 +27,7 @@ import bisq.desktop.main.support.dispute.agent.DisputeAgentView;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.alert.PrivateNotificationManager;
import bisq.core.dao.DaoFacade;
import bisq.core.locale.Res;
import bisq.core.support.SupportType;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeSession;
@ -84,4 +86,15 @@ public class RefundAgentView extends DisputeAgentView {
protected DisputeSession getConcreteDisputeChatSession(Dispute dispute) {
return new RefundSession(dispute, disputeManager.isTrader(dispute));
}
@Override
protected void onCloseDispute(Dispute dispute) {
long protocolVersion = dispute.getContract().getOfferPayload().getProtocolVersion();
// Refund agent was introduced with protocolVersion version 2. We do not support old trade protocol cases.
if (protocolVersion >= 2) {
disputeSummaryWindow.onFinalizeDispute(() -> chatView.removeInputBox()).show(dispute);
} else {
new Popup().warning(Res.get("support.wrongVersion", protocolVersion)).show();
}
}
}