Merge branch 'feature-coinjoin' of https://github.com/dashpay/dashj i…

…nto feature-coinjoin-monitor-improvements

.run/WalletTool CJ Mix.run.xml

@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="WalletTool CJ Mix" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.bitcoinj.tools.WalletTool" />
-    <module name="dashj-master-three.tools.main" />
-    <option name="PROGRAM_PARAMETERS" value="mix --wallet=coinjoin.testnet.wallet --net=TEST --debuglog --amount=0.007 --sessions=4 --rounds=1" />
+    <module name="dashj-feature-coinjoin.tools.main" />
+    <option name="PROGRAM_PARAMETERS" value="mix --wallet=coinjoin.testnet.wallet --net=TEST --debuglog --amount=0.15 --sessions=8 --rounds=1 --multi-session" />
     <option name="VM_PARAMETERS" value="-Djava.library.path=contrib/dashj-bls/bls/target/cmake" />
     <extension name="coverage">
       <pattern>

.run/WalletTool Regular Empty.run.xml

@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="WalletTool Regular Empty" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.bitcoinj.tools.WalletTool" />
+    <module name="dashj-master-three.tools.main" />
+    <option name="PROGRAM_PARAMETERS" value="send --wallet=coinjoin.testnet.wallet --net=TEST --output=yWwJjYLf7B9rY3M2TyBVs1Gw8drNWs8SNz:ALL " />
+    <option name="VM_PARAMETERS" value="-Djava.library.path=contrib/dashj-bls/bls/target/cmake" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.bitcoinj.examples.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

build.gradle

@@ -1,10 +1,14 @@
 buildscript {
     repositories {
         mavenCentral()
+        maven {
+            url = uri("https://plugins.gradle.org/m2/")
+        }
     }
 
     dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.6'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
+        classpath("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.13")
     }
 }
 

core/build.gradle

@@ -4,15 +4,16 @@ apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 apply plugin: 'jacoco'
 apply plugin: 'signing'
+// apply plugin:  'com.github.spotbugs'
 
-version = '19.1-CJ-SNAPSHOT'
+version = '21.0.0-CJ-SNAPSHOT'
 archivesBaseName = 'dashj-core'
 eclipse.project.name = 'dashj-core'
 
 dependencies {
-    compile 'org.bouncycastle:bcprov-jdk15to18:1.68'
-    implementation 'com.google.guava:guava:28.2-android'
-    compile 'com.google.protobuf:protobuf-javalite:3.14.0'
+    implementation 'org.bouncycastle:bcprov-jdk15to18:1.74'
+    implementation 'com.google.guava:guava:30.0-jre'
+    implementation 'com.google.protobuf:protobuf-javalite:3.17.3'
     implementation 'com.squareup.okhttp3:okhttp:3.12.8'
     implementation 'org.slf4j:slf4j-api:1.7.30'
     implementation 'net.jcip:jcip-annotations:1.0'
@@ -29,7 +30,7 @@ dependencies {
     implementation 'de.sfuhrm:saphir-hash-core:3.0.10'
     implementation 'org.dashj:dashj-bls:1.0.0'
     implementation 'com.lambdaworks:scrypt:1.4.0'
-    implementation 'org.json:json:20210307'
+    implementation 'org.json:json:20231013'
 
 }
 
@@ -40,7 +41,7 @@ javadoc.options.encoding = 'UTF-8'
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.14.0'
+        artifact = 'com.google.protobuf:protoc:3.17.3'
     }
     generateProtoTasks {
         all().each { task ->
@@ -51,14 +52,16 @@ protobuf {
             }
         }
     }
-    generatedFilesBaseDir = new File(projectDir, '/src') // workaround for '$projectDir/src'
 }
 
 test {
     exclude 'org/bitcoinj/core/PeerTest*'
     exclude 'org/bitcoinj/core/TransactionBroadcastTest*'
     exclude 'org/bitcoinj/net/NetworkAbstractionTests*'
+    exclude 'org/bitcoinj/net/discovery/DnsDiscoveryTest*'
     exclude 'org/bitcoinj/protocols/channels/ChannelConnectionTest*'
+    exclude 'org/bitcoinj/core/LevelDBFullPrunedBlockChainTest*'
+    exclude 'org/bitcoinj/store/LevelDBBlockStoreTest*'
     testLogging {
         events "failed"
         exceptionFormat "full"
@@ -154,4 +157,16 @@ jacocoTestReport {
         xml.enabled true
         xml.destination file("${project.projectDir}/build/reports/jacoco/jacoco.xml")
     }
-}
+}
+
+//tasks.spotbugsMain {
+//    reports.create("html") {
+//        required = true
+//        outputLocation = file("$buildDir/reports/spotbugs.html")
+//        setStylesheet("fancy-hist.xsl")
+//    }
+//    reports.create("xml") {
+//        required = true
+//        outputLocation = file("$buildDir/reports/spotbugs.xml")
+//    }
+//}