Sync with develop

Signed-off-by: Artem Ananev <[email protected]>

.github/CODEOWNERS

@@ -35,12 +35,10 @@
 /hedera-node/docker/                            @hashgraph/hedera-base @hashgraph/hedera-services @hashgraph/devops-ci @hashgraph/release-engineering @hashgraph/release-engineering-managers
 
 # Hedera Node Modules
-/hedera-node/hedera-mono-service/               @hashgraph/hedera-base @hashgraph/hedera-services
 /hedera-node/hapi*/                             @hashgraph/hedera-base @hashgraph/hedera-services
 /hedera-node/hedera-admin*/                     @hashgraph/hedera-base @hashgraph/hedera-services
 /hedera-node/hedera-app*/                       @hashgraph/hedera-base
 /hedera-node/hedera-consensus*/                 @hashgraph/hedera-base @hashgraph/hedera-services
-/hedera-node/hedera-evm*/                       @hashgraph/hedera-smart-contracts-core
 /hedera-node/hedera-file*/                      @hashgraph/hedera-base @hashgraph/hedera-services
 /hedera-node/hedera-network*/                   @hashgraph/hedera-base @hashgraph/hedera-services
 /hedera-node/hedera-schedule*/                  @hashgraph/hedera-base @hashgraph/hedera-services
@@ -73,7 +71,7 @@
 /platform-sdk/swirlds-config-*/                 @hashgraph/platform-base
 /platform-sdk/swirlds-fchashmap/                @hashgraph/platform-data @hashgraph/platform-architects
 /platform-sdk/swirlds-fcqueue/                  @hashgraph/platform-data @hashgraph/platform-architects
-/platform-sdk/swirlds-jasperdb/                 @hashgraph/platform-data @hashgraph/platform-architects
+/platform-sdk/swirlds-merkledb/                 @hashgraph/platform-data @hashgraph/platform-architects
 /platform-sdk/swirlds-logging/                  @hashgraph/platform-hashgraph @hashgraph/platform-base
 /platform-sdk/swirlds-logging-*/                @hashgraph/platform-base
 /platform-sdk/swirlds-merkle/                   @hashgraph/platform-data @hashgraph/platform-architects

.github/workflows/config/node-release.yaml

@@ -1,11 +1,11 @@
 release:
   branching:
     execution:
-      time: "20:00:00"
+      time: "17:00:00"
     schedule:
-      - on: "2024-07-26"
-        name: release/0.53
+      - on: "2024-08-30"
+        name: release/0.54
         initial-tag:
-          create: false
-          name: v0.53.0-alpha.0
+          create: true
+          name: v0.54.0-alpha.2
 

.github/workflows/node-zxcron-release-fsts-regression.yaml

@@ -16,8 +16,6 @@
 
 name: "ZXCron: [Node] Release JRS Tests"
 on:
-  schedule:
-    - cron: '30 10 * * *'
   workflow_dispatch:
 
 defaults:
@@ -51,7 +49,7 @@ jobs:
             major="${BASH_REMATCH[1]}"
             minor="${BASH_REMATCH[2]}"
 
-            if [[ "${major}" -eq 0 && "${minor}" -lt 52 ]]; then
+            if [[ "${major}" -eq 0 && "${minor}" -lt 53 ]]; then
               continue
             fi
 

.github/workflows/platform-zxcron-release-jrs-regression.yaml

@@ -51,7 +51,7 @@ jobs:
             major="${BASH_REMATCH[1]}"
             minor="${BASH_REMATCH[2]}"
 
-            if [[ "${major}" -eq 0 && "${minor}" -lt 52 ]]; then
+            if [[ "${major}" -eq 0 && "${minor}" -lt 53 ]]; then
               continue
             fi
 

.snyk

@@ -16,5 +16,3 @@ exclude:
       hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/contract/opcodes/Create2OperationSuite.java
     - >-
       hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/keys/deterministic/Bip0032.java
-    - >-
-      hedera-node/hedera-evm/src/main/java/com/hedera/node/app/service/evm/store/contracts/HederaEvmWorldStateTokenAccount.java

README.md

@@ -22,6 +22,9 @@ Implementation of the Platform and the
 
 ## Getting Started
 
+Refer to the [Hedera Architecture and Design](hedera-node/docs/design/design.md) for an architectural overview of the
+Hedera Services project.
+
 Refer to the [Quickstart Guide](docs/README.md) for how to work with this project.
 
 ## Solidity

gradle/plugins/build.gradle.kts

@@ -24,11 +24,11 @@ repositories { gradlePluginPortal() }
 
 dependencies {
     implementation("com.adarshr:gradle-test-logger-plugin:4.0.0")
-    implementation("com.autonomousapps:dependency-analysis-gradle-plugin:1.32.0")
+    implementation("com.autonomousapps:dependency-analysis-gradle-plugin:2.0.1")
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
     implementation("com.github.johnrengelman:shadow:8.1.1")
     implementation("com.google.protobuf:protobuf-gradle-plugin:0.9.4")
-    implementation("com.gradle:develocity-gradle-plugin:3.17.5")
+    implementation("com.gradle:develocity-gradle-plugin:3.18")
     implementation(
         "gradle.plugin.com.google.cloud.artifactregistry:artifactregistry-gradle-plugin:2.2.2"
     )

gradle/plugins/src/main/kotlin/com.hedera.gradle.feature.test-itest.gradle.kts → gradle/plugins/src/main/kotlin/com.hedera.gradle.feature.test-time-consuming.gradle.kts

@@ -16,15 +16,15 @@
 
 plugins { id("java") }
 
-// integration test suite
+// Tests that could be in the default "test" set but take more than 100ms to execute.
 @Suppress("UnstableApiUsage")
 testing.suites {
-    register<JvmTestSuite>("itest") {
-        testType = TestSuiteType.INTEGRATION_TEST
+    register<JvmTestSuite>("timeConsuming") {
+        testType = "timing-consuming"
         targets.all {
             testTask {
                 group = "build"
-                maxHeapSize = "8g"
+                maxHeapSize = "4g"
             }
         }
     }

gradle/plugins/src/main/kotlin/com.hedera.gradle.java.gradle.kts

@@ -15,7 +15,6 @@
  */
 
 import com.adarshr.gradle.testlogger.theme.ThemeType
-import com.autonomousapps.AbstractExtension
 import com.autonomousapps.DependencyAnalysisSubExtension
 import com.hedera.gradle.services.TaskLockService
 import com.hedera.gradle.utils.Utils.versionTxt
@@ -27,6 +26,7 @@ plugins {
     id("jacoco")
     id("checkstyle")
     id("com.adarshr.test-logger")
+    id("com.autonomousapps.dependency-analysis")
     id("com.hedera.gradle.lifecycle")
     id("com.hedera.gradle.jpms-modules")
     id("com.hedera.gradle.repositories")
@@ -74,8 +74,6 @@ jvmDependencyConflicts {
     }
 }
 
-configurations.javaModulesMergeJars { extendsFrom(configurations["internal"]) }
-
 tasks.buildDependents { setGroup(null) }
 
 tasks.buildNeeded { setGroup(null) }
@@ -215,6 +213,16 @@ testing.suites {
             }
         }
     }
+    // remove automatically added compile time dependencies, as we want to define them all
+    // explicitly
+    withType<JvmTestSuite> {
+        configurations.getByName(sources.implementationConfigurationName) {
+            withDependencies {
+                removeIf { it.group == "org.junit.jupiter" && it.name == "junit-jupiter" }
+            }
+        }
+        dependencies { runtimeOnly("org.junit.jupiter:junit-jupiter-engine") }
+    }
 }
 
 // If user gave the argument '-PactiveProcessorCount', then do:
@@ -272,11 +280,7 @@ tasks.withType<JavaCompile>().configureEach {
 // add as testModuleInfo { require(...) } to the main module. This is
 // conceptually wrong, because in whitebox testing the 'main' and 'test'
 // module are conceptually considered one module (main module extended with tests)
-val dependencyAnalysis = extensions.findByType<AbstractExtension>()
-
-if (dependencyAnalysis is DependencyAnalysisSubExtension) {
-    dependencyAnalysis.issues { onAny { exclude(project.path) } }
-}
+configure<DependencyAnalysisSubExtension> { issues { onAny { exclude(project.path) } } }
 
 checkstyle { toolVersion = "10.12.7" }
 

gradle/plugins/src/main/kotlin/com.hedera.gradle.jpms-modules.gradle.kts

@@ -112,10 +112,7 @@ extraJavaModuleInfo {
     module("io.grpc:grpc-protobuf", "io.grpc.protobuf")
     module("io.grpc:grpc-protobuf-lite", "io.grpc.protobuf.lite")
     module("com.github.spotbugs:spotbugs-annotations", "com.github.spotbugs.annotations")
-    module("com.google.code.findbugs:jsr305", "java.annotation") {
-        exportAllPackages()
-        mergeJar("javax.annotation:javax.annotation-api")
-    }
+    module("com.google.code.findbugs:jsr305", "java.annotation")
     module("com.google.errorprone:error_prone_annotations", "com.google.errorprone.annotations")
     module("com.google.j2objc:j2objc-annotations", "com.google.j2objc.annotations")
     module("com.google.protobuf:protobuf-java", "com.google.protobuf") {

gradle/plugins/src/main/kotlin/com.hedera.gradle.protobuf.gradle.kts

@@ -15,19 +15,12 @@
  */
 
 import com.google.protobuf.gradle.id
-import com.hedera.gradle.tasks.GitClone
 
 plugins {
     id("com.hedera.gradle.services")
     id("com.google.protobuf")
 }
 
-tasks.register<GitClone>("cloneHederaProtobufs") {
-    url = "https://github.com/hashgraph/hedera-protobufs.git"
-    offline = gradle.startParameter.isOffline
-    localCloneDirectory = layout.buildDirectory.dir("hedera-protobufs")
-}
-
 // Configure Protobuf Plugin to download protoc executable rather than using local installed version
 protobuf {
     val libs = the<VersionCatalogsExtension>().named("libs")
@@ -38,7 +31,9 @@ protobuf {
             artifact = "io.grpc:protoc-gen-grpc-java:" + libs.findVersion("grpc-proto").get()
         }
     }
-    generateProtoTasks { ofSourceSet("main").forEach { it.plugins { id("grpc") } } }
+    generateProtoTasks {
+        all().configureEach { plugins { id("grpc") { option("@generated=omit") } } }
+    }
 }
 
 sourceSets.all {

gradle/plugins/src/main/kotlin/com.hedera.gradle.root.gradle.kts

@@ -24,7 +24,6 @@ plugins {
     id("com.hedera.gradle.nexus-publish")
     id("com.hedera.gradle.spotless-kotlin")
     id("com.hedera.gradle.spotless-markdown")
-    id("com.autonomousapps.dependency-analysis")
 }
 
 spotless {