Merge pull request #7041 from jmacxx/remove_wiz_bsq_explorer

Remove reference to non-functioning BSQ explorer
bisq-network · Feb 25, 2024 · 42d40e5 · 42d40e5
2 parents a3f5bf5 + b151d11
commit 42d40e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/core/src/main/java/bisq/core/app/BisqSetup.java b/core/src/main/java/bisq/core/app/BisqSetup.java
@@ -44,6 +44,7 @@
 import bisq.core.support.dispute.refund.RefundManager;
 import bisq.core.trade.TradeManager;
 import bisq.core.trade.bisq_v1.TradeTxException;
+import bisq.core.user.BlockChainExplorer;
 import bisq.core.user.Preferences;
 import bisq.core.user.User;
 import bisq.core.util.FormattingUtils;
@@ -341,6 +342,7 @@ private void step4() {
         maybeShowLocalhostRunningInfo();
         maybeShowAccountSigningStateInfo();
         maybeShowTorAddressUpgradeInformation();
+        maybeUpgradeBsqExplorerUrl();
         checkInboundConnections();
     }
 
@@ -783,6 +785,14 @@ private void maybeTriggerDisplayHandler(String key, Consumer<String> displayHand
         }
     }
 
+    private void maybeUpgradeBsqExplorerUrl() {
+        // if wiz BSQ explorer selected, replace with 1st explorer in the list of available.
+        if (preferences.getBsqBlockChainExplorer().name.equalsIgnoreCase("mempool.space (@wiz)") &&
+                preferences.getBsqBlockChainExplorers().size() > 0) {
+            preferences.setBsqBlockChainExplorer(preferences.getBsqBlockChainExplorers().get(0));
+        }
+    }
+
     private void maybeShowTorAddressUpgradeInformation() {
         if (Config.baseCurrencyNetwork().isRegtest() ||
                 Utils.isV3Address(Objects.requireNonNull(p2PService.getNetworkNode().getNodeAddress()).getHostName())) {

diff --git a/core/src/main/java/bisq/core/user/Preferences.java b/core/src/main/java/bisq/core/user/Preferences.java
@@ -116,7 +116,6 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid
     ));
 
     public static final ArrayList<BlockChainExplorer> BSQ_MAIN_NET_EXPLORERS = new ArrayList<>(Arrays.asList(
-            new BlockChainExplorer("mempool.space (@wiz)", "https://mempool.space/bisq/tx/", "https://mempool.space/bisq/address/"),
             new BlockChainExplorer("bisq.mempool.emzy.de (@emzy)", "https://bisq.mempool.emzy.de/tx/", "https://bisq.mempool.emzy.de/address/"),
             new BlockChainExplorer("mempool.bisq.services (@devinbileck)", "https://mempool.bisq.services/bisq/tx/", "https://mempool.bisq.services/bisq/address/")
     ));