Merge pull request #2602 from oscarguindzberg/use-latest-bitcoinj

Use the latest bisq's bitcoinj (00298b1)
bisq-network · Mar 30, 2019 · c876269 · c876269
2 parents bdf6689 + fcbbec6
commit c876269
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ configure(subprojects) {
         jmockitVersion = '1.42'
         joptVersion = '5.0.3'
         langVersion = '3.4'
-        bitcoinjVersion = '9df95d6'
+        bitcoinjVersion = '00298b1'
         logbackVersion = '1.1.10'
         lombokVersion = '1.18.2'
         mockitoVersion = '2.21.0'

diff --git a/core/src/main/java/bisq/core/btc/nodes/BtcNodeConverter.java b/core/src/main/java/bisq/core/btc/nodes/BtcNodeConverter.java
@@ -23,7 +23,7 @@
 import bisq.network.DnsLookupTor;
 
 import org.bitcoinj.core.PeerAddress;
-import org.bitcoinj.net.OnionCat;
+import org.bitcoinj.net.OnionCatConverter;
 
 import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
 
@@ -56,7 +56,7 @@ PeerAddress convertOnionHost(BtcNode node) {
         // no DNS lookup for onion addresses
         String onionAddress = Objects.requireNonNull(node.getOnionAddress());
         try {
-            // OnionCat.onionHostToInetAddress converts onion to ipv6 representation
+            // OnionCatConverter.onionHostToInetAddress converts onion to ipv6 representation
             // inetAddress is not used but required for wallet persistence. Throws nullPointer if not set.
             InetAddress inetAddress = facade.onionHostToInetAddress(onionAddress);
             PeerAddress result = new PeerAddress(onionAddress, node.getPort());
@@ -127,7 +127,7 @@ private static PeerAddress create(String hostName, int port) {
 
     static class Facade {
         InetAddress onionHostToInetAddress(String onionAddress) throws UnknownHostException {
-            return OnionCat.onionHostToInetAddress(onionAddress);
+            return OnionCatConverter.onionHostToInetAddress(onionAddress);
         }
 
         InetAddress torLookup(Socks5Proxy proxy, String host) throws DnsLookupException {

diff --git a/gradle/witness/gradle-witness.gradle b/gradle/witness/gradle-witness.gradle
@@ -38,7 +38,7 @@ dependencyVerification {
         'com.googlecode.json-simple:json-simple:4e69696892b88b41c55d49ab2fdcc21eead92bf54acc588c0050596c3b75199c',
         'org.springframework:spring-core:c451e8417adb2ffb2445636da5e44a2f59307c4100037a1fe387c3fba4f29b52',
         'ch.qos.logback:logback-classic:e66efc674e94837344bc5b748ff510c37a44eeff86cbfdbf9e714ef2eb374013',
-        'com.github.bisq-network.bitcoinj:bitcoinj-core:e47a7224dbdf02446d0b471f0148fced607761c0a58f7cd0c5abffab9a5b32b0',
+        'com.github.bisq-network.bitcoinj:bitcoinj-core:816e976a7efcfb650ff9009059059068b785ead864a6321fe77bba65ebd3d273',
         'org.slf4j:slf4j-api:3a4cd4969015f3beb4b5b4d81dbafc01765fb60b8a439955ca64d8476fef553e',
         'ch.qos.logback:logback-core:4cd46fa17d77057b39160058df2f21ebbc2aded51d0edcc25d2c1cecc042a005',
         'com.google.code.findbugs:jsr305:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',