Merge branch 'master_upstream' into improve-network-statistics

bisq-network · Aug 28, 2020 · 5ac1f6e · 5ac1f6e
2 parents 8c61953 + 3599355
commit 5ac1f6e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -497,6 +497,14 @@ configure(project(':pricenode')) {
 
     test {
         useJUnitPlatform()
+
+        // Disabled by default, since spot provider tests include connections to external API endpoints
+        // Can be enabled by adding -Dtest.pricenode.includeSpotProviderTests=true to the gradle command:
+        // ./gradlew test -Dtest.pricenode.includeSpotProviderTests=true
+        if (System.properties['test.pricenode.includeSpotProviderTests'] != 'true') {
+            project.logger.lifecycle('Pricenode: Skipping spot provider tests')
+            exclude 'bisq/price/spot/providers/**'
+        }
     }
 
     task stage {

diff --git a/core/src/main/java/bisq/core/user/Preferences.java b/core/src/main/java/bisq/core/user/Preferences.java
@@ -82,6 +82,8 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid
             new BlockChainExplorer("mempool.space Tor V3", "http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/tx/", "http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/address/"),
             new BlockChainExplorer("mempool.emzy.de (@emzy)", "https://mempool.emzy.de/tx/", "https://mempool.emzy.de/address/"),
             new BlockChainExplorer("mempool.emzy.de Tor V3", "http://mempool4t6mypeemozyterviq3i5de4kpoua65r3qkn5i3kknu5l2cad.onion/tx/", "http://mempool4t6mypeemozyterviq3i5de4kpoua65r3qkn5i3kknu5l2cad.onion/address/"),
+            new BlockChainExplorer("mempool.bisq.services (@devinbileck)", "https://mempool.bisq.services/tx/", "https://mempool.bisq.services/address/"),
+            new BlockChainExplorer("mempool.bisq.services Tor V3", "http://mempoolusb2f67qi7mz2it7n5e77a6komdzx6wftobcduxszkdfun2yd.onion/tx/", "http://mempoolusb2f67qi7mz2it7n5e77a6komdzx6wftobcduxszkdfun2yd.onion/address/"),
             new BlockChainExplorer("Blockstream.info", "https://blockstream.info/tx/", "https://blockstream.info/address/"),
             new BlockChainExplorer("Blockstream.info Tor V3", "http://explorerzydxu5ecjrkwceayqybizmpjjznk5izmitf2modhcusuqlid.onion/tx/", "http://explorerzydxu5ecjrkwceayqybizmpjjznk5izmitf2modhcusuqlid.onion/address/"),
             new BlockChainExplorer("OXT", "https://oxt.me/transaction/", "https://oxt.me/address/"),

diff --git a/pricenode/src/main/resources/application.properties b/pricenode/src/main/resources/application.properties
@@ -5,5 +5,5 @@ spring.jackson.serialization.indent_output=true
 bisq.price.mining.providers.mempoolHostname.1=mempool.space
 bisq.price.mining.providers.mempoolHostname.2=mempool.emzy.de
 bisq.price.mining.providers.mempoolHostname.3=mempool.ninja
-# bisq.price.mining.providers.mempoolHostname.4=someHostOrIP
+bisq.price.mining.providers.mempoolHostname.4=mempool.bisq.services
 # bisq.price.mining.providers.mempoolHostname.5=someHostOrIP