From ba333f225c768b64c1884697b853dd1ef681ba73 Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Thu, 9 Jan 2025 20:20:37 +0000 Subject: [PATCH] Refactor baseCurrencyNetwork field to getter access --- .../java/bisq/btcnodemonitor/server/SimpleHttpServer.java | 2 +- .../main/java/bisq/btcnodemonitor/socksProxy/ProxySetup.java | 2 +- common/src/main/java/bisq/common/config/Config.java | 4 +++- common/src/main/java/bisq/common/setup/CommonSetup.java | 2 +- .../src/main/java/bisq/core/api/CoreDisputeAgentsService.java | 4 ++-- core/src/main/java/bisq/core/app/BisqSetup.java | 2 +- core/src/main/java/bisq/core/app/WalletAppSetup.java | 2 +- core/src/main/java/bisq/core/app/misc/AppSetup.java | 2 +- core/src/main/java/bisq/core/app/misc/AppSetupWithP2P.java | 2 +- core/src/main/java/bisq/core/btc/BitcoinModule.java | 4 ++-- core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java | 2 +- core/src/main/java/bisq/core/btc/setup/WalletsSetup.java | 2 +- .../java/bisq/core/dao/state/DaoStateSnapshotService.java | 2 +- .../bisq/core/network/p2p/seed/DefaultSeedNodeRepository.java | 2 +- .../java/bisq/core/provider/PriceFeedNodeAddressProvider.java | 2 +- 15 files changed, 19 insertions(+), 17 deletions(-) diff --git a/btcnodemonitor/src/main/java/bisq/btcnodemonitor/server/SimpleHttpServer.java b/btcnodemonitor/src/main/java/bisq/btcnodemonitor/server/SimpleHttpServer.java index a0385613a36..52b12b918fe 100644 --- a/btcnodemonitor/src/main/java/bisq/btcnodemonitor/server/SimpleHttpServer.java +++ b/btcnodemonitor/src/main/java/bisq/btcnodemonitor/server/SimpleHttpServer.java @@ -75,7 +75,7 @@ public SimpleHttpServer(Config config, PeerConncetionModel peerConncetionModel) started = new Date().toString(); providedBtcNodes = peerConncetionModel.getProvidedBtcNodes(); - BaseCurrencyNetwork network = config.baseCurrencyNetwork; + BaseCurrencyNetwork network = config.getBaseCurrencyNetwork(); if (config.useTorForBtcMonitor) { port = network.isMainnet() ? 8000 : 8001; networkInfo = network.isMainnet() ? "TOR/MAIN_NET" : "TOR/REG_TEST"; diff --git a/btcnodemonitor/src/main/java/bisq/btcnodemonitor/socksProxy/ProxySetup.java b/btcnodemonitor/src/main/java/bisq/btcnodemonitor/socksProxy/ProxySetup.java index 5a04a534a6c..e04a861888d 100644 --- a/btcnodemonitor/src/main/java/bisq/btcnodemonitor/socksProxy/ProxySetup.java +++ b/btcnodemonitor/src/main/java/bisq/btcnodemonitor/socksProxy/ProxySetup.java @@ -57,7 +57,7 @@ public ProxySetup(Config config) { socksProxyFactory = new SocksProxyFactory("127.0.0.1"); Socks5ProxyProvider socks5ProxyProvider = new Socks5ProxyProvider("", ""); socks5ProxyProvider.setSocks5ProxyInternal(socksProxyFactory); - String networkDirName = config.baseCurrencyNetwork.name().toLowerCase(); + String networkDirName = config.getBaseCurrencyNetwork().name().toLowerCase(); torDir = Paths.get(config.appDataDir.getPath(), networkDirName, "tor").toFile(); } diff --git a/common/src/main/java/bisq/common/config/Config.java b/common/src/main/java/bisq/common/config/Config.java index b7b647d6859..7e08999743d 100644 --- a/common/src/main/java/bisq/common/config/Config.java +++ b/common/src/main/java/bisq/common/config/Config.java @@ -29,6 +29,7 @@ import ch.qos.logback.classic.Level; import lombok.Getter; +import lombok.Setter; import static com.google.common.base.Preconditions.checkNotNull; import static java.lang.String.format; @@ -178,7 +179,8 @@ public class Config { public final List bannedPriceRelayNodes; public final List bannedSeedNodes; public final List filterProvidedSeedNodes; - public final BaseCurrencyNetwork baseCurrencyNetwork; + @Getter + private final BaseCurrencyNetwork baseCurrencyNetwork; public final NetworkParameters networkParameters; public final boolean ignoreLocalBtcNode; public final String bitcoinRegtestHost; diff --git a/common/src/main/java/bisq/common/setup/CommonSetup.java b/common/src/main/java/bisq/common/setup/CommonSetup.java index 25e826ce512..367c3be3402 100644 --- a/common/src/main/java/bisq/common/setup/CommonSetup.java +++ b/common/src/main/java/bisq/common/setup/CommonSetup.java @@ -52,7 +52,7 @@ public class CommonSetup { public static void setup(Config config, GracefulShutDownHandler gracefulShutDownHandler) { setupLog(config); AsciiLogo.showAsciiLogo(); - Version.setBaseCryptoNetworkId(config.baseCurrencyNetwork.ordinal()); + Version.setBaseCryptoNetworkId(config.getBaseCurrencyNetwork().ordinal()); Version.printVersion(); maybePrintPathOfCodeSource(); Profiler.printSystemLoad(); diff --git a/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java b/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java index 1cc7dff1c26..43063b3473c 100644 --- a/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java +++ b/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java @@ -82,8 +82,8 @@ void registerDisputeAgent(String disputeAgentType, String registrationKey) { if (!p2PService.isBootstrapped()) throw new NotAvailableException("p2p service is not bootstrapped yet"); - if (config.baseCurrencyNetwork.isMainnet() - || config.baseCurrencyNetwork.isDaoBetaNet() + if (config.getBaseCurrencyNetwork().isMainnet() + || config.getBaseCurrencyNetwork().isDaoBetaNet() || !config.useLocalhostForP2P) throw new UnsupportedOperationException("dispute agents must be registered in a Bisq UI"); diff --git a/core/src/main/java/bisq/core/app/BisqSetup.java b/core/src/main/java/bisq/core/app/BisqSetup.java index f47d77cc41c..fbbc36d399a 100644 --- a/core/src/main/java/bisq/core/app/BisqSetup.java +++ b/core/src/main/java/bisq/core/app/BisqSetup.java @@ -380,7 +380,7 @@ private void maybeShowTac(Runnable nextStep) { } private void readMapsFromResources(Runnable completeHandler) { - String postFix = "_" + config.baseCurrencyNetwork.name(); + String postFix = "_" + config.getBaseCurrencyNetwork().name(); p2PService.getP2PDataStorage().readFromResources(postFix, completeHandler); } diff --git a/core/src/main/java/bisq/core/app/WalletAppSetup.java b/core/src/main/java/bisq/core/app/WalletAppSetup.java index eff4668138f..83b08131baf 100644 --- a/core/src/main/java/bisq/core/app/WalletAppSetup.java +++ b/core/src/main/java/bisq/core/app/WalletAppSetup.java @@ -284,6 +284,6 @@ else if (preferences.getUseTorForBitcoinJ()) postFix = " " + Res.get("mainView.footer.usingTor"); else postFix = ""; - return Res.get(config.baseCurrencyNetwork.name()) + postFix; + return Res.get(config.getBaseCurrencyNetwork().name()) + postFix; } } diff --git a/core/src/main/java/bisq/core/app/misc/AppSetup.java b/core/src/main/java/bisq/core/app/misc/AppSetup.java index 88e8b12f15b..e83aa5ece80 100644 --- a/core/src/main/java/bisq/core/app/misc/AppSetup.java +++ b/core/src/main/java/bisq/core/app/misc/AppSetup.java @@ -33,7 +33,7 @@ public AppSetup(Config config) { // we need to reference it so the seed node stores tradeStatistics this.config = config; - Version.setBaseCryptoNetworkId(this.config.baseCurrencyNetwork.ordinal()); + Version.setBaseCryptoNetworkId(this.config.getBaseCurrencyNetwork().ordinal()); Version.printVersion(); } diff --git a/core/src/main/java/bisq/core/app/misc/AppSetupWithP2P.java b/core/src/main/java/bisq/core/app/misc/AppSetupWithP2P.java index e2ac8515597..ec9f3a0c412 100644 --- a/core/src/main/java/bisq/core/app/misc/AppSetupWithP2P.java +++ b/core/src/main/java/bisq/core/app/misc/AppSetupWithP2P.java @@ -93,7 +93,7 @@ public void initPersistedDataHosts() { @Override protected void initBasicServices() { - String postFix = "_" + config.baseCurrencyNetwork.name(); + String postFix = "_" + config.getBaseCurrencyNetwork().name(); p2PDataStorage.readFromResources(postFix, this::startInitP2PNetwork); } diff --git a/core/src/main/java/bisq/core/btc/BitcoinModule.java b/core/src/main/java/bisq/core/btc/BitcoinModule.java index 1f3ad302e27..90ee0a974bc 100644 --- a/core/src/main/java/bisq/core/btc/BitcoinModule.java +++ b/core/src/main/java/bisq/core/btc/BitcoinModule.java @@ -57,9 +57,9 @@ protected void configure() { // otherwise the specified host or default (localhost) String regTestHost = config.bitcoinRegtestHost; if (regTestHost.isEmpty()) { - regTestHost = config.baseCurrencyNetwork.isDaoTestNet() ? + regTestHost = config.getBaseCurrencyNetwork().isDaoTestNet() ? "104.248.31.39" : - config.baseCurrencyNetwork.isDaoRegTest() ? + config.getBaseCurrencyNetwork().isDaoRegTest() ? "134.209.242.206" : Config.DEFAULT_REGTEST_HOST; } diff --git a/core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java b/core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java index 358de89a124..48fefe22825 100644 --- a/core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java +++ b/core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java @@ -51,7 +51,7 @@ public boolean shouldBeUsed() { * Returns whether Bisq should ignore a local Bitcoin node even if it is usable. */ public boolean shouldBeIgnored() { - BaseCurrencyNetwork baseCurrencyNetwork = config.baseCurrencyNetwork; + BaseCurrencyNetwork baseCurrencyNetwork = config.getBaseCurrencyNetwork(); // For dao testnet (server side regtest) we disable the use of local bitcoin node // to avoid confusion if local btc node is not synced with our dao testnet master diff --git a/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java b/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java index 7e63554a059..1edaffba92a 100644 --- a/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java +++ b/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java @@ -172,7 +172,7 @@ public WalletsSetup(RegTestHost regTestHost, this.socks5DiscoverMode = evaluateMode(socks5DiscoverModeString); this.walletDir = walletDir; - btcWalletFileName = "bisq_" + config.baseCurrencyNetwork.getCurrencyCode() + ".wallet"; + btcWalletFileName = "bisq_" + config.getBaseCurrencyNetwork().getCurrencyCode() + ".wallet"; params = Config.baseCurrencyNetworkParameters(); PeerGroup.setIgnoreHttpSeeds(true); } diff --git a/core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java b/core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java index 28f8a410b62..7409b771432 100644 --- a/core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java +++ b/core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java @@ -133,7 +133,7 @@ public void shutDown() { @Override public void onParseBlockCompleteAfterBatchProcessing(Block block) { - if (config.baseCurrencyNetwork.isMainnet() && + if (config.getBaseCurrencyNetwork().isMainnet() && walletsSetup.isDownloadComplete() && daoStateService.getChainHeight() == bsqWalletService.getBestChainHeight()) { // In case the DAO state is invalid we might get an outdated RECIPIENT_BTC_ADDRESS. In that case we trigger diff --git a/core/src/main/java/bisq/core/network/p2p/seed/DefaultSeedNodeRepository.java b/core/src/main/java/bisq/core/network/p2p/seed/DefaultSeedNodeRepository.java index 0ed50628450..a1a1a159a73 100644 --- a/core/src/main/java/bisq/core/network/p2p/seed/DefaultSeedNodeRepository.java +++ b/core/src/main/java/bisq/core/network/p2p/seed/DefaultSeedNodeRepository.java @@ -71,7 +71,7 @@ private void reload() { } cache.clear(); - List result = getSeedNodeAddressesFromPropertyFile(config.baseCurrencyNetwork.name().toLowerCase(Locale.ENGLISH)); + List result = getSeedNodeAddressesFromPropertyFile(config.getBaseCurrencyNetwork().name().toLowerCase(Locale.ENGLISH)); cache.addAll(result); Set filterProvidedSeedNodes = config.filterProvidedSeedNodes.stream() diff --git a/core/src/main/java/bisq/core/provider/PriceFeedNodeAddressProvider.java b/core/src/main/java/bisq/core/provider/PriceFeedNodeAddressProvider.java index 74f8428b2f0..937d2d0a673 100644 --- a/core/src/main/java/bisq/core/provider/PriceFeedNodeAddressProvider.java +++ b/core/src/main/java/bisq/core/provider/PriceFeedNodeAddressProvider.java @@ -90,7 +90,7 @@ public void selectNextProviderBaseUrl() { baseUrl = providerList.get(index); index++; - if (providerList.size() == 1 && config.baseCurrencyNetwork.isMainnet()) + if (providerList.size() == 1 && config.getBaseCurrencyNetwork().isMainnet()) log.warn("We only have one provider"); } else { baseUrl = "";