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

Add hint to upgrade to tor v3 #5573

Merged
merged 9 commits into from
Jun 23, 2021
Merged

Add hint to upgrade to tor v3 #5573

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ab7fe66
Only allow dispute to be reopened if local node address matches contr…
ripcurlx Jun 9, 2021
fb55e43
Only allow failed trade to be moved to pending trades if local node a…
ripcurlx Jun 9, 2021
e9ef413
Display a tor node address v3 upgrade prompt
ripcurlx Jun 14, 2021
0dbbf4d
Remove stale "NEW" badge on settings
ripcurlx Jun 14, 2021
8acd578
Prevent nodes with Tor v2 address to participate in trading
ripcurlx Jun 14, 2021
6e213e9
Prevent reopen of disputes with tor node v2 addresses after cut off date
ripcurlx Jun 14, 2021
54006dc
Not require Tor v3 addresses on Regtest
ripcurlx Jun 14, 2021
5a8e1cf
Adapted tor migration message
ripcurlx Jun 17, 2021
8d18e07
Apply PR Review suggestion by @sqrrm
ripcurlx Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import bisq.core.dao.DaoFacade;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.Res;
import bisq.core.offer.OfferRestrictions;
import bisq.core.support.SupportType;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeList;
Expand All @@ -58,6 +59,7 @@

import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.P2PService;
import bisq.network.utils.Utils;

import bisq.common.UserThread;
import bisq.common.crypto.KeyRing;
Expand Down Expand Up @@ -542,6 +544,11 @@ protected boolean reOpenDispute() {
private boolean isDisputeWithSameCurrentNodeAddress(Dispute dispute, boolean isMediator) {
NodeAddress disputeNodeAddress = isMediator ? dispute.getContract().getMediatorNodeAddress() :
dispute.getContract().getMyNodeAddress(keyRing.getPubKeyRing());

if (OfferRestrictions.requiresNodeAddressUpdate() && !Utils.isV3Address(disputeNodeAddress.getHostName())) {
return false;
}

return Objects.equals(p2PService.getNetworkNode().getNodeAddress(), disputeNodeAddress);
}

Expand Down