diff --git a/build.gradle b/build.gradle index ec2249366d..bc35e4e5ce 100644 --- a/build.gradle +++ b/build.gradle @@ -163,7 +163,7 @@ configure(project(':common')) { compile 'org.slf4j:slf4j-api:1.7.22' compile 'ch.qos.logback:logback-core:1.1.10' compile 'ch.qos.logback:logback-classic:1.1.10' - compile 'com.google.code.findbugs:jsr305:3.0.1' + compile 'com.google.code.findbugs:jsr305:3.0.2' compile 'com.google.guava:guava:20.0' compile('com.google.inject:guice:4.1.0') { exclude(module: 'guava') @@ -213,7 +213,7 @@ configure(project(':core')) { compile project(':assets') compile project(':p2p') compile "net.sf.jopt-simple:jopt-simple:$joptVersion" - compile('network.bisq.btcd-cli4j:btcd-cli4j-core:3864e1c4') { + compile('network.bisq.btcd-cli4j:btcd-cli4j-core:065d3786') { exclude(module: 'slf4j-api') exclude(module: 'httpclient') exclude(module: 'commons-lang3') @@ -221,7 +221,7 @@ configure(project(':core')) { exclude(module: 'jackson-annotations') exclude(module: 'jackson-databind') } - compile('network.bisq.btcd-cli4j:btcd-cli4j-daemon:3864e1c4') { + compile('network.bisq.btcd-cli4j:btcd-cli4j-daemon:065d3786') { exclude(module: 'slf4j-api') exclude(module: 'httpclient') exclude(module: 'commons-lang3') diff --git a/core/src/main/java/bisq/core/dao/node/full/RpcService.java b/core/src/main/java/bisq/core/dao/node/full/RpcService.java index 3dd890b64c..9753070ad1 100644 --- a/core/src/main/java/bisq/core/dao/node/full/RpcService.java +++ b/core/src/main/java/bisq/core/dao/node/full/RpcService.java @@ -30,6 +30,7 @@ import bisq.common.util.Utilities; import org.bitcoinj.core.Utils; import com.neemre.btcdcli4j.core.BitcoindException; +import com.neemre.btcdcli4j.core.BtcdCli4jVersion; import com.neemre.btcdcli4j.core.CommunicationException; import com.neemre.btcdcli4j.core.client.BtcdClient; import com.neemre.btcdcli4j.core.client.BtcdClientImpl; @@ -107,6 +108,8 @@ public class RpcService { this.rpcBlockPort = rpcBlockPort != null && !rpcBlockPort.isEmpty() ? rpcBlockPort : "5125"; this.dumpBlockchainData = dumpBlockchainData; + + log.info("Version of btcd-cli4j library: {}", BtcdCli4jVersion.VERSION); } diff --git a/gradle/witness/gradle-witness.gradle b/gradle/witness/gradle-witness.gradle index d783af5cb0..167a6aee14 100644 --- a/gradle/witness/gradle-witness.gradle +++ b/gradle/witness/gradle-witness.gradle @@ -26,8 +26,8 @@ dependencyVerification { 'org.apache.httpcomponents:httpclient:db3d1b6c2d6a5e5ad47577ad61854e2f0e0936199b8e05eb541ed52349263135', 'net.sf.jopt-simple:jopt-simple:6f45c00908265947c39221035250024f2caec9a15c1c8cf553ebeecee289f342', 'org.fxmisc.easybind:easybind:666af296dda6de68751668a62661571b5238ac6f1c07c8a204fc6f902b222aaf', - 'network.bisq.btcd-cli4j:btcd-cli4j-daemon:4f56e94428a49290056709f3485a266eacde00a33d41ee995a046fac95eb5c25', - 'network.bisq.btcd-cli4j:btcd-cli4j-core:4d1a5637cc89234595ad05f023597bda51fb179c4d1fb296ee94a1106e4fda21', + 'network.bisq.btcd-cli4j:btcd-cli4j-daemon:c007116da1b0145ddee64bb3a54fef60d58ce5c3dcf27773f39471117be8f132', + 'network.bisq.btcd-cli4j:btcd-cli4j-core:b1d0525f3629bad358ad4a40ea3be998220110331d4b9d24e76d7894e563a595', 'com.fasterxml.jackson.core:jackson-databind:fcf3c2b0c332f5f54604f7e27fa7ee502378a2cc5df6a944bbfae391872c32ff', 'com.fasterxml.jackson.core:jackson-core:39a74610521d7fb9eb3f437bb8739bbf47f6435be12d17bf954c731a0c6352bb', 'com.fasterxml.jackson.core:jackson-annotations:2566b3a6662afa3c6af4f5b25006cb46be2efc68f1b5116291d6998a8cdf7ed3', @@ -40,7 +40,7 @@ dependencyVerification { 'com.github.bisq-network.bitcoinj:bitcoinj-core:d148d9577cf96540f7f5367011f7626ff9c9f148f0bf903b541740d480652969', 'org.slf4j:slf4j-api:3a4cd4969015f3beb4b5b4d81dbafc01765fb60b8a439955ca64d8476fef553e', 'ch.qos.logback:logback-core:4cd46fa17d77057b39160058df2f21ebbc2aded51d0edcc25d2c1cecc042a005', - 'com.google.code.findbugs:jsr305:c885ce34249682bc0236b4a7d56efcc12048e6135a5baf7a9cde8ad8cda13fcd', + 'com.google.code.findbugs:jsr305:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7', 'com.google.guava:guava:36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8', 'com.google.inject:guice:9b9df27a5b8c7864112b4137fd92b36c3f1395bfe57be42fedf2f520ead1a93e', 'com.github.JesusMcCloud.netlayer:tor:ac8465b7dda30ea920ec31a6bde42df7e88bee0282e805ce2797628938e3cf0b',