Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: prepare v20 branch for release #238

Merged
merged 3 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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 ->
Expand Down
10 changes: 5 additions & 5 deletions core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions core/src/main/java/org/bitcoin/paymentchannel/Protos.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions core/src/main/java/org/bitcoin/protocols/payments/Protos.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/bitcoinj/core/VersionMessage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 + "/";

Expand Down
1 change: 1 addition & 0 deletions core/src/main/java/org/bitcoinj/params/MainNetParams.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading
Loading