Remove olympia-engine module

Signed-off-by: Sergiy Yevtushenko <sergiy@radixdlt.com>
Signed-off-by: Sergiy Yevtushenko <sergiy.yevtushenko@rdx.works>

Dockerfile

@@ -12,7 +12,7 @@
 # =================================================================================================
 FROM debian:12.1-slim AS java-build-stage
 
-LABEL org.opencontainers.image.source https://github.com/radixdlt/babylon-node
+LABEL org.opencontainers.image.source=https://github.com/radixdlt/babylon-node
 LABEL org.opencontainers.image.authors="devops@radixdlt.com"
 LABEL org.opencontainers.image.description="Java + Debian 12 (OpenJDK)"
 
@@ -60,7 +60,7 @@ RUN apt-get update \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
+ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
 
 RUN mkdir -p /radixdlt
 # Copy the relevant files at the repo root
@@ -78,7 +78,6 @@ COPY ./gradle /radixdlt/gradle
 COPY ./common /radixdlt/common
 COPY ./core /radixdlt/core
 COPY ./core-rust-bridge /radixdlt/core-rust-bridge
-COPY ./olympia-engine /radixdlt/olympia-engine
 COPY ./cli-tools /radixdlt/cli-tools
 COPY ./shell /radixdlt/shell
 COPY ./keygen /radixdlt/keygen
@@ -232,7 +231,7 @@ COPY --from=library-build-stage /libcorerust.so /
 # =================================================================================================
 FROM debian:12.1-slim as app-container
 
-LABEL org.opencontainers.image.source https://github.com/radixdlt/babylon-node
+LABEL org.opencontainers.image.source="https://github.com/radixdlt/babylon-node"
 LABEL org.opencontainers.image.authors="devops@radixdlt.com"
 
 # Install dependencies needed for building the image or running the application

README.md

@@ -25,24 +25,19 @@ Here we have:
 - [docker](docker): An option for running a network of nodes locally. You can also use the "Run Single Validator" IntelliJ option.
 - [testnet-node](testnet-node): The easiest way to set up a development environment for integrators (check the [README](testnet-node/README.md))
 
-Until the Babylon engine is feature-compatible with Olympia, we are keeping around the Olympia engine for
-some of our tests.
-
-- [olympia-engine](olympia-engine): The Olympia Radix execution layer which provides a UTXO-based state machine
-
 ## Contribute
 
 Please follow our [Code of Conduct](CODE_OF_CONDUCT.md) in all your interactions with the project.
 See the [Contributing Guide](CONTRIBUTING.md) for more details on how to get involved.
 
 ## Links
 
-| Link | Description |
-| :----- | :------ |
-[radixdlt.com](https://radixdlt.com/) | Radix DLT Homepage
-[docs-babylon.radixdlt.com](https://docs-babylon.radixdlt.com/) | Radix Babylon Technical Documentation
-[learn.radixdlt.com](https://learn.radixdlt.com/) | Radix Knowledge Base
-[discord invite](https://discord.com/invite/WkB2USt) | Radix Discord Server
+| Link                                                            | Description                           |
+|-----------------------------------------------------------------|---------------------------------------|
+| [radixdlt.com](https://radixdlt.com/)                           | Radix DLT Homepage                    |                   
+| [docs-babylon.radixdlt.com](https://docs-babylon.radixdlt.com/) | Radix Babylon Technical Documentation |
+| [learn.radixdlt.com](https://learn.radixdlt.com/)               | Radix Knowledge Base                  |
+| [discord invite](https://discord.com/invite/WkB2USt)            | Radix Discord Server                  |
 
 ## License
 

cli-tools/build.gradle

@@ -101,7 +101,6 @@ dependencies {
     implementation project(':core')
     implementation project(':core-rust-bridge')
     implementation project(':common')
-    implementation project(':olympia-engine')
 
     implementation 'commons-cli:commons-cli'
     implementation "com.github.akarnokd:rxjava3-extensions"
@@ -178,7 +177,6 @@ task generateDevGenesis(type: Exec) {
     dependsOn ':core:jar'
     dependsOn ':common:jar'
     dependsOn ':core-rust-bridge:jar'
-    dependsOn ':olympia-engine:jar'
     group = "Execution"
     description = "Generate development genesis"
     environment "LD_PRELOAD", "${project(':core-rust').projectDir}/target/debug/libcorerust.so"
@@ -197,7 +195,6 @@ task generateGenesisFile(type: Exec) {
     dependsOn ':core:jar'
     dependsOn ':common:jar'
     dependsOn ':core-rust-bridge:jar'
-    dependsOn ':olympia-engine:jar'
     group = "Execution"
     description = "Generate development genesis"
     environment "LD_PRELOAD", "${project(':core-rust').projectDir}/target/debug/libcorerust.so"
@@ -252,5 +249,4 @@ task runP2pTests(type: JavaExec) {
     environment "LD_PRELOAD", "${project(':core-rust').projectDir}/target/debug/libcorerust.so"
     systemProperty "java.library.path", "${project(':core-rust').projectDir}/target/debug/"
     main = "com.radixdlt.p2ptest.LargeMessageTest"
-
 }

core/build.gradle

@@ -223,7 +223,6 @@ jacocoTestReport {
 }
 
 dependencies {
-    implementation project(':olympia-engine')
     implementation project(':common')
     implementation project(':core-rust-bridge')
     implementation project(':keygen')
@@ -233,7 +232,7 @@ dependencies {
     implementation "com.github.akarnokd:rxjava3-extensions"
     implementation 'io.reactivex.rxjava3:rxjava'
     implementation 'com.sleepycat:je'
-    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 
     implementation 'com.lmax:disruptor'
 

settings.gradle

@@ -3,15 +3,13 @@ rootProject.name='babylon-node'
 // NOTE - If changing this, also update `update-locks.sh`
 include ':core'
 include ':cli-tools'
-include ':olympia-engine'
 include ':common'
 include ':core-rust-bridge'
 include ':core-rust'
 include ':keygen'
 
 project(':core').projectDir = new File('core')
 project(':cli-tools').projectDir = new File('cli-tools')
-project(':olympia-engine').projectDir = new File('olympia-engine')
 project(':common').projectDir = new File('common')
 project(':core-rust-bridge').projectDir = new File('core-rust-bridge')
 project(':core-rust').projectDir = new File('core-rust')

update-locks.sh

@@ -8,9 +8,6 @@ echo "\n>> Writing locks for core dependencies...\n"
 echo "\n>> Writing locks for cli-tools dependencies...\n"
 ./gradlew :cli-tools:dependencies --write-locks | sed '/BUILD SUCCESSFUL/d' | tee ./cli-tools/dependencies-tree.txt
 
-echo "\n>> Writing locks for olympia-engine dependencies...\n"
-./gradlew :olympia-engine:dependencies --write-locks | sed '/BUILD SUCCESSFUL/d' | tee ./olympia-engine/dependencies-tree.txt
-
 echo "\n>> Writing locks for common dependencies...\n"
 ./gradlew :common:dependencies --write-locks | sed '/BUILD SUCCESSFUL/d' | tee ./common/dependencies-tree.txt