Sync with develop

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

.github/dependabot.yml

@@ -1,7 +1,12 @@
 version: 2
 updates:
   - package-ecosystem: "gradle"
-    directory: "/"
+    directory: "/hedera-dependency-versions"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/gradle/plugins"
     schedule:
       interval: "daily"
     open-pull-requests-limit: 10

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

@@ -1,11 +1,11 @@
 release:
   branching:
     execution:
-      time: "20:00:00"
+      time: "22:00:00"
     schedule:
-      - on: "2023-02-27"
-        name: release/0.48
+      - on: "2024-05-06"
+        name: release/0.50
         initial-tag:
-          create: false
-          name: v0.45.0-alpha.2
+          create: true
+          name: v0.50.0-alpha.0
 

.github/workflows/node-flow-build-application.yaml

@@ -94,3 +94,4 @@ jobs:
       codacy-project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
       gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }}
       gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }}
+      codecov-token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/node-flow-deploy-adhoc-artifact.yaml

@@ -51,7 +51,7 @@ jobs:
     with:
       version-policy: branch-commit
       trigger-env-deploy: none
-      sdk-release-profile: AdhocCommit
+      release-profile: AdhocCommit
       dry-run-enabled: ${{ github.event.inputs.dry-run-enabled == 'true' }}
       java-version: ${{ github.event.inputs.java-version || '21.0.1' }}
       java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }}

.github/workflows/node-flow-deploy-release-artifact.yaml

@@ -70,7 +70,7 @@ jobs:
       version-policy: specified
       new-version: ${{ needs.prepare-tag-release.outputs.version }}
       trigger-env-deploy: none
-      sdk-release-profile: ${{ needs.prepare-tag-release.outputs.prerelease == 'true' && 'PrereleaseChannel' || 'MavenCentral' }}
+      release-profile: ${{ needs.prepare-tag-release.outputs.prerelease == 'true' && 'PrereleaseChannel' || 'MavenCentral' }}
     secrets:
       access-token: ${{ secrets.GITHUB_TOKEN }}
       bucket-name: ${{ secrets.RELEASE_ARTIFACT_BUCKET_NAME }}
@@ -97,7 +97,7 @@ jobs:
     with:
       version-policy: branch-commit
       trigger-env-deploy: integration
-      sdk-release-profile: DevelopCommit
+      release-profile: DevelopCommit
     secrets:
       access-token: ${{ secrets.GITHUB_TOKEN }}
       bucket-name: ${{ secrets.RELEASE_ARTIFACT_BUCKET_NAME }}

.github/workflows/node-flow-pull-request-checks.yaml

@@ -87,6 +87,7 @@ jobs:
       gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }}
       gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }}
       codacy-project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+      codecov-token: ${{ secrets.CODECOV_TOKEN }}
 
   eet-tests:
     name: E2E Tests

.github/workflows/node-zxc-build-release-artifact.yaml

@@ -29,15 +29,15 @@ on:
         type: string
         required: true
         default: "none"
-      # Valid SDK release profiles are as follows:
+      # Valid release profiles are as follows:
       # - none
       # - AdhocCommit
       # - DevelopCommit
       # - DevelopDailySnapshot
       # - DevelopSnapshot
       # - PrereleaseChannel
-      sdk-release-profile:
-        description: "SDK Release Profile:"
+      release-profile:
+        description: "Release Profile:"
         type: string
         required: true
         default: "none"
@@ -687,103 +687,12 @@ jobs:
           name: Production Image Manifests
           path: ${{ env.DOCKER_MANIFEST_PATH }}
 
-  evm-mc-publish:
-    name: Publish EVM to Maven Central
+  publish:
+    name: Publish to ${{ inputs.version-policy == 'specified' && 'Maven Central' || 'GCP Registry' }}
     runs-on: [ self-hosted, Linux, large, ephemeral ]
     needs:
       - validate
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-      - name: Install GnuPG Tools
-        if: ${{ inputs.dry-run-enabled != true }}
-        run: |
-          if ! command -v gpg2 >/dev/null 2>&1; then
-            echo "::group::Updating APT Repository Indices"
-              sudo apt update
-            echo "::endgroup::"
-            echo "::group::Installing GnuPG Tools"
-              sudo apt install -y gnupg2
-            echo "::endgroup::"
-          fi
-
-      - name: Import GPG key
-        id: gpg_key
-        uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0
-        if: ${{ inputs.dry-run-enabled != true && !cancelled() && !failure() }}
-        with:
-          gpg_private_key: ${{ secrets.svcs-gpg-key-contents }}
-          passphrase: ${{ secrets.svcs-gpg-key-passphrase }}
-          git_config_global: true
-          git_user_signingkey: true
-          git_commit_gpgsign: true
-          git_tag_gpgsign: true
-
-      - name: Setup Java
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
-        with:
-          distribution: ${{ inputs.java-distribution }}
-          java-version: ${{ inputs.java-version }}
-
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
-        with:
-          gradle-version: ${{ inputs.gradle-version }}
-
-      - name: Restore Build Version
-        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
-        with:
-          fail-on-cache-miss: true
-          path: version.txt
-          key: node-build-version-${{ needs.validate.outputs.version }}-${{ github.sha }}
-
-      - name: Gradle Update Version (Snapshot)
-        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
-        if: ${{ inputs.version-policy != 'specified' && !cancelled() && !failure() }}
-        with:
-          gradle-version: ${{ inputs.gradle-version }}
-          arguments: versionAsSnapshot --scan
-
-      - name: Gradle Assemble
-        id: gradle-build
-        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
-        with:
-          gradle-version: ${{ inputs.gradle-version }}
-          arguments: assemble --scan
-
-      - name: Gradle Version Summary
-        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
-        with:
-          gradle-version: ${{ inputs.gradle-version }}
-          arguments: githubVersionSummary --scan
-
-      - name: Gradle Maven Central Release
-        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
-        if: ${{ inputs.dry-run-enabled != true && inputs.version-policy == 'specified' && !cancelled() && !failure() }}
-        env:
-          OSSRH_USERNAME: ${{ secrets.svcs-ossrh-username }}
-          OSSRH_PASSWORD: ${{ secrets.svcs-ossrh-password }}
-        with:
-          gradle-version: ${{ inputs.gradle-version }}
-          arguments: "releaseEvmMavenCentral --scan -PpublishSigningEnabled=true --no-configuration-cache --no-parallel"
-
-      - name: Gradle Maven Central Snapshot
-        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
-        if: ${{ inputs.dry-run-enabled != true && inputs.version-policy != 'specified' && !cancelled() && !failure() }}
-        env:
-          OSSRH_USERNAME: ${{ secrets.svcs-ossrh-username }}
-          OSSRH_PASSWORD: ${{ secrets.svcs-ossrh-password }}
-        with:
-          gradle-version: ${{ inputs.gradle-version }}
-          arguments: "releaseEvmMavenCentralSnapshot --scan -PpublishSigningEnabled=true --no-configuration-cache --no-parallel"
-
-  sdk-publish:
-    name: Publish Platform to ${{ inputs.version-policy == 'specified' && 'Maven Central' || 'GCP Registry' }}
-    runs-on: [ self-hosted, Linux, large, ephemeral ]
-    needs:
-      - validate
-    if: ${{ inputs.sdk-release-profile != 'none' }}
+    if: ${{ inputs.release-profile != 'none' }}
     steps:
       - name: Checkout Code
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -924,15 +833,15 @@ jobs:
             gpg --output "${PUBLIC_ARCHIVE_FILE}.sha256.asc" --detach-sig "${PUBLIC_ARCHIVE_FILE}.sha256"
           echo "::endgroup::"
 
-      - name: Gradle Publish to ${{ inputs.version-policy == 'specified' && 'Maven Central' || 'Google Artifact Registry' }} (${{ inputs.sdk-release-profile }})
+      - name: Gradle Publish to ${{ inputs.version-policy == 'specified' && 'Maven Central' || 'Google Artifact Registry' }} (${{ inputs.release-profile }})
         uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
-        if: ${{ inputs.dry-run-enabled != true && inputs.sdk-release-profile != 'none' && !cancelled() && !failure() }}
+        if: ${{ inputs.dry-run-enabled != true && inputs.release-profile != 'none' && !cancelled() && !failure() }}
         env:
           OSSRH_USERNAME: ${{ secrets.sdk-ossrh-username }}
           OSSRH_PASSWORD: ${{ secrets.sdk-ossrh-password }}
         with:
           gradle-version: ${{ inputs.gradle-version }}
-          arguments: "release${{ inputs.sdk-release-profile }} --scan -PpublishSigningEnabled=true --no-configuration-cache --no-parallel"
+          arguments: "release${{ inputs.release-profile }} --scan -PpublishSigningEnabled=true --no-configuration-cache"
 
       - name: Upload SDK Release Archives
         if: ${{ inputs.dry-run-enabled != true && inputs.version-policy == 'specified' && !cancelled() && !failure() }}
@@ -949,8 +858,7 @@ jobs:
       - validate
       - local-node-images
       - validate-production-image
-      - evm-mc-publish
-      - sdk-publish
+      - publish
     if: ${{ inputs.dry-run-enabled != true && inputs.version-policy == 'specified' && !cancelled() && !failure() }}
     steps:
       - name: Determine Notification Parameters
@@ -960,7 +868,7 @@ jobs:
           ARTIFACT_LINK_NAME="MC Availability Check"
           ARTIFACT_REGISTRY="Maven Central"
 
-          if [[ "${{ inputs.sdk-release-profile }}" == "PrereleaseChannel" ]]; then
+          if [[ "${{ inputs.release-profile }}" == "PrereleaseChannel" ]]; then
             ARTIFACT_URL="https://console.cloud.google.com/artifacts/maven/swirlds-registry/us/maven-prerelease-channel/com.swirlds:swirlds-platform-core/${{ needs.validate.outputs.version }}?project=swirlds-registry"
             ARTIFACT_LINK_NAME="GCP Registry"
             ARTIFACT_REGISTRY="GCP Artifact Registry"

.github/workflows/node-zxc-compile-application-code.yaml

@@ -125,6 +125,9 @@ on:
       codacy-project-token:
         description: "The Codacy project token used to report code coverage."
         required: false
+      codecov-token:
+        description: "The Codecov token used to report code coverage."
+        required: false
 
 defaults:
   run:
@@ -224,7 +227,7 @@ jobs:
       - name: Unit Testing
         id: gradle-test
         if: ${{ inputs.enable-unit-tests && steps.gradle-build.conclusion == 'success' && !cancelled() }}
-        run: ${GRADLE_EXEC} test timingSensitive jacocoTestReport --continue --scan
+        run: ${GRADLE_EXEC} :reports:testCodeCoverageReport --continue --scan
 
       - name: Publish Unit Test Report
         uses: EnricoMi/publish-unit-test-result-action@30eadd5010312f995f0d3b3cff7fe2984f69409e # v2.16.1
@@ -298,14 +301,14 @@ jobs:
           check_name: 'Node: HAPI Test (Misc) Results'
           check_run_disabled: false
           json_thousands_separator: ','
-          junit_files: "**/build/test-results/hapiTestMisc/TEST-*.xml"
+          junit_files: "**/test-clients/build/test-results/test/TEST-*.xml"
 
       - name: Upload HAPI Test (Misc) Report Artifacts
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         if: ${{ inputs.enable-hapi-tests-misc && steps.gradle-build.conclusion == 'success' && !cancelled() }}
         with:
           name: HAPI Test (Misc) Reports
-          path: "**/build/test-results/hapiTestMisc/TEST-*.xml"
+          path: "**/test-clients/build/test-results/test/TEST-*.xml"
           retention-days: 7
 
       - name: Upload HAPI Test (Misc) Network Logs
@@ -332,14 +335,14 @@ jobs:
           check_name: 'Node: HAPI Test (Crypto) Results'
           check_run_disabled: false
           json_thousands_separator: ','
-          junit_files: "**/build/test-results/hapiTestCrypto/TEST-*.xml"
+          junit_files: "**/test-clients/build/test-results/test/TEST-*.xml"
 
       - name: Upload HAPI Test (Crypto) Report Artifacts
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         if: ${{ inputs.enable-hapi-tests-crypto && steps.gradle-build.conclusion == 'success' && !cancelled() }}
         with:
           name: HAPI Test (Crypto) Report
-          path: "**/build/test-results/hapiTestCrypto/TEST-*.xml"
+          path: "**/test-clients/build/test-results/test/TEST-*.xml"
           retention-days: 7
 
       - name: Upload HAPI Test (crypto) Network Logs
@@ -366,14 +369,14 @@ jobs:
           check_name: 'Node: HAPI Test (Token) Results'
           check_run_disabled: false
           json_thousands_separator: ','
-          junit_files: "**/build/test-results/hapiTestToken/TEST-*.xml"
+          junit_files: "**/test-clients/build/test-results/test/TEST-*.xml"
 
       - name: Upload HAPI Test (Token) Report Artifacts
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         if: ${{ inputs.enable-hapi-tests-token && steps.gradle-build.conclusion == 'success' && !cancelled() }}
         with:
           name: HAPI Test (Token) Report
-          path: "**/build/test-results/hapiTestToken/TEST-*.xml"
+          path: "**/test-clients/build/test-results/test/TEST-*.xml"
           retention-days: 7
 
       - name: Upload HAPI Test (Token) Network Logs
@@ -400,14 +403,14 @@ jobs:
           check_name: 'Node: HAPI Test (Smart Contract) Results'
           check_run_disabled: false
           json_thousands_separator: ','
-          junit_files: "**/build/test-results/hapiTestSmartContract/TEST-*.xml"
+          junit_files: "**/test-clients/build/test-results/test/TEST-*.xml"
 
       - name: Upload HAPI Test (Smart Contract) Report Artifacts
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         if: ${{ inputs.enable-hapi-tests-smart-contract && steps.gradle-build.conclusion == 'success' && !cancelled() }}
         with:
           name: HAPI Test (Smart Contract) Report
-          path: "**/build/test-results/hapiTestSmartContract/TEST-*.xml"
+          path: "**/test-clients/build/test-results/test/TEST-*.xml"
           retention-days: 7
 
       - name: Upload HAPI Test (Smart Contract) Network Logs
@@ -434,14 +437,14 @@ jobs:
           check_name: 'Node: HAPI Test (Time Consuming) Results'
           check_run_disabled: false
           json_thousands_separator: ','
-          junit_files: "**/build/test-results/hapiTestTimeConsuming/TEST-*.xml"
+          junit_files: "**/test-clients/build/test-results/test/TEST-*.xml"
 
       - name: Upload HAPI Test (Time Consuming) Report Artifacts
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         if: ${{ inputs.enable-hapi-tests-time-consuming && steps.gradle-build.conclusion == 'success' && !cancelled() }}
         with:
           name: HAPI Test (Time Consuming) Report
-          path: "**/build/test-results/hapiTestTimeConsuming/TEST-*.xml"
+          path: "**/test-clients/build/test-results/test/TEST-*.xml"
           retention-days: 7
 
       - name: Upload HAPI Test (Time Consuming) Network Logs
@@ -468,14 +471,14 @@ jobs:
           check_name: 'Node: HAPI Test (Restart) Results'
           check_run_disabled: false
           json_thousands_separator: ','
-          junit_files: "**/build/test-results/hapiTestRestart/TEST-*.xml"
+          junit_files: "**/test-clients/build/test-results/test/TEST-*.xml"
 
       - name: Upload HAPI Test (Restart) Report Artifacts
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         if: ${{ inputs.enable-hapi-tests-restart && steps.gradle-build.conclusion == 'success' && !cancelled() }}
         with:
           name: HAPI Test (Restart) Report
-          path: "**/build/test-results/hapiTestRestart/TEST-*.xml"
+          path: "**/test-clients/build/test-results/test/TEST-*.xml"
           retention-days: 7
 
       - name: Upload HAPI Test (Restart) Network Logs
@@ -503,14 +506,14 @@ jobs:
           check_name: 'Node: HAPI Test (Node Death Reconnect) Results'
           check_run_disabled: false
           json_thousands_separator: ','
-          junit_files: "**/build/test-results/hapiTestNDReconnect/TEST-*.xml"
+          junit_files: "**/test-clients/build/test-results/test/TEST-*.xml"
 
       - name: Upload HAPI Test (Node Death Reconnect) Report Artifacts
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         if: ${{ inputs.enable-hapi-tests-nd-reconnect && steps.gradle-build.conclusion == 'failure' && !cancelled() }}
         with:
           name: HAPI Test (Node Death Reconnect) Report
-          path: "**/build/test-results/hapiTestNDReconnect/TEST-*.xml"
+          path: "**/test-clients/build/test-results/test/TEST-*.xml"
           retention-days: 7
 
       - name: Upload HAPI Test (Node Death Reconnect) Network Logs
@@ -557,12 +560,16 @@ jobs:
       - name: Publish To Codecov
         if: ${{ inputs.enable-unit-tests && !cancelled() }}
         uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
+        env:
+          CODECOV_TOKEN: ${{ secrets.codecov-token }}
+        with:
+          files: gradle/reports/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
 
       - name: Publish to Codacy
         env:
           CODACY_PROJECT_TOKEN: ${{ secrets.codacy-project-token }}
         if: ${{ inputs.enable-unit-tests && !cancelled() }}
-        run: bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l Java $(find . -name 'jacoco*.xml' -printf '-r %p ')
+        run: bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l Java -r gradle/reports/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
 
       - name: Upload Test Reports
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1

block-node/blocknode-core-spi/build.gradle.kts

@@ -14,4 +14,7 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.hashgraph.blocknode.conventions") }
+plugins {
+    id("com.hedera.gradle.blocknode")
+    id("com.hedera.gradle.blocknode-publish")
+}