Merge pull request #238 from dashpay/feature-core-20-release

chore: prepare v20 branch for release
dashpay · Dec 7, 2023 · 3da9f7a · 3da9f7a
2 parents a9a3168 + 50ea365
commit 3da9f7a
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 87 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 = '20.0.0-SNAPSHOT'
+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:30.0-jre'
-    compile 'com.google.protobuf:protobuf-javalite:3.14.0'
+    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'
@@ -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/NetworkParameters.java b/core/src/main/java/org/bitcoinj/core/NetworkParameters.java
@@ -667,7 +667,7 @@ public EnumSet<Script.VerifyFlag> getTransactionVerificationFlags(final Block bl
     public abstract int getProtocolVersionNum(final ProtocolVersion version);
 
     public static enum ProtocolVersion {
-        MINIMUM(70228),
+        MINIMUM(70230),
         PONG(60001),
         BLOOM_FILTER(MINIMUM.getBitcoinProtocolVersion()),
         BLOOM_FILTER_BIP111(MINIMUM.getBitcoinProtocolVersion()+1),

diff --git a/core/src/main/java/org/bitcoinj/core/VersionMessage.java b/core/src/main/java/org/bitcoinj/core/VersionMessage.java
@@ -44,7 +44,7 @@
 public class VersionMessage extends Message {
 
     /** The version of this library release, as a string. */
-    public static final String BITCOINJ_VERSION = "20.0.0-SNAPSHOT";
+    public static final String BITCOINJ_VERSION = "20.0.0";
     /** The value that is prepended to the subVer field of this application. */
     public static final String LIBRARY_SUBVER = "/DashJ:" + BITCOINJ_VERSION + "/";
 

diff --git a/core/src/main/java/org/bitcoinj/params/MainNetParams.java b/core/src/main/java/org/bitcoinj/params/MainNetParams.java
@@ -331,6 +331,7 @@ public MainNetParams() {
         DIP0008BlockHeight = 1088640;
         DIP0024BlockHeight = 1737792 + 4 * 288; // DIP24 activation time + 4 cycles
         v19BlockHeight = 1899072;
+        v20BlockHeight = 1987776;
 
         // long living quorum params
         addLLMQ(LLMQParameters.LLMQType.LLMQ_50_60);