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.

Sign up for GitHub

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

Cuttlefish - Release Candidate 1 #1020

Merged
merged 11 commits into from
Nov 13, 2024
Merged

Cuttlefish - Release Candidate 1 #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e8ae9ad
fix: Remove some fixed `TODO:CUTTLEFISH`
dhedey Nov 12, 2024
3b160eb
update: To `cuttlefish-423e26ab`
dhedey Nov 12, 2024
754b373
fix: Update Dockerfile
dhedey Nov 12, 2024
2118c0f
fix: Fill in the message in a preview v2 validation error
dhedey Nov 12, 2024
2db81a2
refactor: Minor docs / name changes to CFs
dhedey Nov 12, 2024
b133897
tweak: Add a finalized subintent hash index
dhedey Nov 12, 2024
5794463
tweak: Update test config to make it less flaky
dhedey Nov 12, 2024
daaeadc
feature: Updates to Core API for Cuttlefish
dhedey Nov 13, 2024
06928ee
feat: Added mainnet cuttlefish protocol update config
dhedey Nov 13, 2024
95b3225
tweak: Update dependencies
dhedey Nov 13, 2024
763e2ff
fix: Fix test compilation error
dhedey Nov 13, 2024
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
14 changes: 7 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ ENV VERSION_LAST_TAG=$VERSION_LAST_TAG
# - https://packages.debian.org/bookworm/openjdk-17-jdk
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
docker.io=20.10.24+dfsg1-1+b3 \
libssl-dev=3.0.14-1~deb12u2 \
docker.io=20.10.24+dfsg1-1+deb12u1 \
libssl-dev=3.0.15-1~deb12u1 \
pkg-config=1.8.1-1 \
unzip=6.0-28 \
wget=${WGET_VERSION} \
Expand Down Expand Up @@ -126,12 +126,12 @@ RUN apt-get update \
ca-certificates \
build-essential=12.9 \
# https://security-tracker.debian.org/tracker/CVE-2023-38545
curl=7.88.1-10+deb12u7 \
curl=7.88.1-10+deb12u8 \
g++-aarch64-linux-gnu \
g++-x86-64-linux-gnu \
libc6-dev-arm64-cross=2.36-8cross1 \
libclang-dev=1:14.0-55.7~deb12u1 \
libssl-dev=3.0.14-1~deb12u2 \
libssl-dev=3.0.15-1~deb12u1 \
pkg-config=1.8.1-1 \
&& rm -rf /var/lib/apt/lists/*

Expand Down Expand Up @@ -259,9 +259,9 @@ LABEL org.opencontainers.image.authors="devops@radixdlt.com"
# - https://packages.debian.org/bookworm/libc6
RUN apt-get update -y \
&& apt-get -y --no-install-recommends install \
openjdk-17-jre-headless=17.0.12+7-2~deb12u1 \
openjdk-17-jre-headless=17.0.13+11-2~deb12u1 \
# https://security-tracker.debian.org/tracker/CVE-2023-38545
curl=7.88.1-10+deb12u7 \
curl=7.88.1-10+deb12u8 \
gettext-base=0.21-12 \
daemontools=1:0.76-8.1 \
# https://security-tracker.debian.org/tracker/CVE-2023-4911
Expand Down Expand Up @@ -322,4 +322,4 @@ COPY docker/build_scripts/config_radixdlt.sh /opt/radixdlt/config_radixdlt.sh

# See https://docs.docker.com/engine/reference/builder/#entrypoint
ENTRYPOINT ["/opt/radixdlt/config_radixdlt.sh"]
CMD ["/opt/radixdlt/bin/core"]
CMD ["/opt/radixdlt/bin/core"]
22 changes: 11 additions & 11 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@ subprojects {
dependency 'com.lmax:disruptor:3.4.4'

dependency 'commons-cli:commons-cli:1.4'
dependency 'org.xerial.snappy:snappy-java:1.1.8.4'
dependency 'io.netty:netty-all:4.1.109.Final'
dependency 'org.xerial.snappy:snappy-java:1.1.10.1'
dependency 'io.netty:netty-all:4.1.115.Final'
dependency('com.google.inject:guice:5.0.1') {
exclude 'com.google.guava:guava'
}
Expand All @@ -274,7 +274,7 @@ subprojects {
exclude 'com.google.guava:guava'
}

dependency 'io.undertow:undertow-core:2.2.9.Final'
dependency 'io.undertow:undertow-core:2.2.37.Final'
dependency 'com.stijndewitt.undertow.cors:undertow-cors-filter:0.4.0'

dependency 'org.apache.logging.log4j:log4j-api:2.17.1'
Expand All @@ -288,17 +288,17 @@ subprojects {
dependency 'org.bouncycastle:bcprov-jdk15on:1.70'
dependency 'org.bouncycastle:bcpkix-jdk15on:1.70'

dependency 'org.json:json:20180813'
dependency 'org.json:json:20230227'

dependency 'com.fasterxml.jackson.core:jackson-databind:2.12.4'
dependency 'com.fasterxml.jackson.core:jackson-core:2.12.4'
dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.4'
dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.4'
dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.4'
dependency('com.fasterxml.jackson.datatype:jackson-datatype-json-org:2.12.4') {
dependency 'com.fasterxml.jackson.core:jackson-databind:2.15.4'
dependency 'com.fasterxml.jackson.core:jackson-core:2.15.4'
dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.4'
dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.4'
dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.4'
dependency('com.fasterxml.jackson.datatype:jackson-datatype-json-org:2.15.4') {
exclude 'org.json:json'
}
dependency('com.fasterxml.jackson.datatype:jackson-datatype-guava:2.12.4') {
dependency('com.fasterxml.jackson.datatype:jackson-datatype-guava:2.15.4') {
exclude 'com.google.guava:guava'
}

Expand Down
2,118 changes: 1,080 additions & 1,038 deletions cli-tools/dependencies-tree.txt
View file
Open in desktop

Large diffs are not rendered by default.

92 changes: 46 additions & 46 deletions cli-tools/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

549 changes: 298 additions & 251 deletions common/dependencies-tree.txt
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions common/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.12.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.12.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-databind:2.12.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.datatype:jackson-datatype-guava:2.12.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.datatype:jackson-datatype-json-org:2.12.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson:jackson-bom:2.12.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-databind:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.datatype:jackson-datatype-guava:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.datatype:jackson-datatype-json-org:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,spotless865453420,testCompileClasspath,testRuntimeClasspath
com.google.errorprone:error_prone_annotations:2.11.0=compileClasspath,runtimeClasspath,spotless865453420,testCompileClasspath,testRuntimeClasspath
com.google.googlejavaformat:google-java-format:1.13.0=spotless865453420
Expand Down Expand Up @@ -48,7 +48,7 @@ org.jacoco:org.jacoco.ant:0.8.7=jacocoAnt
org.jacoco:org.jacoco.core:0.8.7=jacocoAnt
org.jacoco:org.jacoco.report:0.8.7=jacocoAnt
org.javassist:javassist:3.26.0-GA=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.json:json:20180813=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.json:json:20230227=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-core:3.12.4=testCompileClasspath,testRuntimeClasspath
org.objenesis:objenesis:3.2=testCompileClasspath,testRuntimeClasspath
org.ow2.asm:asm-analysis:9.1=jacocoAnt
Expand Down
Loading
Loading