Merge pull request #237 from dashpay/feature-core-20

feat: support Dash Core 20
dashpay · Dec 8, 2023 · 0ce9035 · 0ce9035
2 parents 7773c1f + 3da9f7a
commit 0ce9035
Show file tree

Hide file tree

Showing 94 changed files with 2,560 additions and 1,167 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -5,14 +5,14 @@ apply plugin: 'maven-publish'
 apply plugin: 'jacoco'
 apply plugin: 'signing'
 
-version = '19.0.6'
+version = '20.0.0'
 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 'com.google.guava:guava:30.0-jre'
+    compile '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 +29,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:20220320'
 
 }
 
@@ -40,7 +40,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 ->

diff --git a/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java b/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java
diff --git a/core/src/main/java/org/bitcoin/paymentchannel/Protos.java b/core/src/main/java/org/bitcoin/paymentchannel/Protos.java
diff --git a/core/src/main/java/org/bitcoin/protocols/payments/Protos.java b/core/src/main/java/org/bitcoin/protocols/payments/Protos.java
diff --git a/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java b/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java
@@ -127,6 +127,11 @@ public BitcoinSerializer(NetworkParameters params, boolean parseRetain) {
         this.parseRetain = parseRetain;
     }
 
+    public BitcoinSerializer(NetworkParameters params, boolean parseRetain, int protocolVersion) {
+        this(params, parseRetain);
+        setProtocolVersion(protocolVersion);
+    }
+
     /**
      * Writes message to to the output stream.
      */