Update dependencies

build.gradle

@@ -55,8 +55,8 @@ dependencies {
     implementation libs.spark.core
     implementation libs.apache.commons.compress
     implementation libs.tukaani
-    implementation libs.chimp.jsocks
-    implementation libs.chimp.jtorctl
+    implementation libs.jsocks
+    implementation libs.jtorctl
 
     implementation libs.slf4j.api
     implementation libs.logback.classic

gradle/libs.versions.toml

@@ -19,8 +19,8 @@ protobuf = { strictly = '3.19.1' }
 bitcoinj = { strictly = '42bbae9' }
 apache-commons-compress-lib = { strictly = '1.21' }
 tukaani-lib = { strictly = '1.9' }
-chimp-jsocks-lib = { strictly = '567e1cd6' }
-chimp-jtorctl-lib = { strictly = '9b5ba203' }
+jsocks-lib = { strictly = '43b004b' }
+jtorctl-lib = { strictly = 'b2a172f' }
 
 # Referenced in subproject's build.gradle > dependencies block in the form 'implementation libs.guava'
 # Note: keys can contain dash (protobuf-java) but the dash is replaced by dot when referenced
@@ -42,8 +42,8 @@ protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "p
 bitcoinj = { module = "com.github.bisq-network:bitcoinj", version.ref = "bitcoinj" }
 apache-commons-compress = { module = 'org.apache.commons:commons-compress', version.ref = 'apache-commons-compress-lib' }
 tukaani = { module = 'org.tukaani:xz', version.ref = 'tukaani-lib' }
-chimp-jsocks = { module = 'com.github.chimp1984:jsocks', version.ref = 'chimp-jsocks-lib' }
-chimp-jtorctl = { module = 'com.github.chimp1984:jtorctl', version.ref = 'chimp-jtorctl-lib' }
+jsocks = { module = 'com.github.bisq-network:jsocks', version.ref = 'jsocks-lib' }
+jtorctl = { module = 'com.github.bisq-network:jtorctl', version.ref = 'jtorctl-lib' }
 
 [bundles]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionSha256Sum=740c2e472ee4326c33bf75a5c9f5cd1e69ecf3f9b580f6e236c86d1f3d98cfac
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/bisq/monitor/dump/DataDump.java

@@ -52,7 +52,7 @@ public void startApplication() {
         priceFeedService.setCurrencyCode("USD");
         p2pService.addP2PServiceListener(new BootstrapListener() {
             @Override
-            public void onUpdatedDataReceived() {
+            public void onDataReceived() {
                 // we need to have tor ready
                 log.info("onBootstrapComplete: we start requestPriceFeed");
                 priceFeedService.requestPriceFeed(price -> log.info("requestPriceFeed. price=" + price),

src/main/java/bisq/monitor/dump/handlers/OffersHandler.java

@@ -88,7 +88,7 @@ public OffersHandler(ReporterProvider reporterProvider,
         priceFeedService.setCurrencyCode("USD");
         bootstrapListener = new BootstrapListener() {
             @Override
-            public void onUpdatedDataReceived() {
+            public void onDataReceived() {
                 // we need to have tor ready
                 log.info("onBootstrapComplete: we start requestPriceFeed");
                 priceFeedService.requestPriceFeed(price -> {

src/main/java/bisq/monitor/monitor/MonitorMain.java

@@ -24,6 +24,7 @@
 import bisq.common.app.Version;
 import bisq.common.config.BaseCurrencyNetwork;
 import bisq.common.config.Config;
+import bisq.common.util.SingleThreadExecutorUtils;
 import bisq.common.util.Utilities;
 import bisq.core.locale.Res;
 import bisq.core.setup.CoreNetworkCapabilities;
@@ -64,7 +65,7 @@ public static void main(String[] args) {
         Reporter reporter = "true".equals(properties.getProperty("GraphiteReporter.enabled", "false")) ?
                 new GraphiteReporter(properties) : new ConsoleReporter();
 
-        executor = Utilities.getSingleThreadExecutor("Monitor");
+        executor = SingleThreadExecutorUtils.getSingleThreadExecutor("Monitor");
         CompletableFuture.runAsync(() -> {
             monitor = new Monitor(properties, reporter, appDir);
             monitor.start();

src/main/java/bisq/monitor/monitor/tasks/PriceNodeData.java

@@ -17,7 +17,7 @@
 
 package bisq.monitor.monitor.tasks;
 
-import bisq.core.provider.ProvidersRepository;
+import bisq.core.provider.PriceFeedNodeAddressProvider;
 import bisq.monitor.monitor.MonitorHttpClient;
 import bisq.monitor.monitor.MonitorTask;
 import bisq.monitor.monitor.TorNode;
@@ -53,7 +53,7 @@ public PriceNodeData(Properties properties, Reporter reporter, TorNode torNode)
 
         String hosts = properties.getProperty("Monitor.PriceNodeData.hosts", "");
         if (hosts == null || hosts.isEmpty()) {
-            addresses.addAll(ProvidersRepository.DEFAULT_NODES.stream()
+            addresses.addAll(PriceFeedNodeAddressProvider.DEFAULT_NODES.stream()
                     .map(address -> {
                         if (address.endsWith("/")) {
                             return address.substring(0, address.length() - 1);
@@ -65,7 +65,6 @@ public PriceNodeData(Properties properties, Reporter reporter, TorNode torNode)
         } else {
             addresses.addAll(List.of(hosts.split(",")));
         }
-        addresses.add("https://price.bisq.wiz.biz");
 
         excluded.add("NON_EXISTING_SYMBOL");
         excluded.addAll(Set.of(properties.getProperty("Monitor.PriceNodeData.excluded", "").split(",")));

src/main/java/bisq/monitor/monitor/tasks/TorHiddenServiceStartupTime.java

@@ -17,7 +17,7 @@
 
 package bisq.monitor.monitor.tasks;
 
-import bisq.common.util.Utilities;
+import bisq.common.util.SingleThreadExecutorUtils;
 import bisq.monitor.monitor.MonitorTask;
 import bisq.monitor.monitor.TorNode;
 import bisq.monitor.reporter.Metrics;
@@ -55,7 +55,7 @@ public void run() {
                 } catch (IOException | InterruptedException e) {
                     throw new RuntimeException(e);
                 }
-            }, Utilities.getSingleThreadExecutor("createHS"));
+            }, SingleThreadExecutorUtils.getSingleThreadExecutor("createHS"));
             future.join();
             reporter.report(new Metrics("torNetwork.hiddenServicePublishingTime", System.currentTimeMillis() - ts));
         } catch (Throwable e) {