Merge upstream

Signed-off-by: Michael Tinker <[email protected]>
hashgraph · Jun 21, 2023 · f363e6c · f363e6c
2 parents 6f97095 + 5f564ae
commit f363e6c
Show file tree

Hide file tree

Showing 663 changed files with 30,137 additions and 13,688 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -23,7 +23,7 @@
 /hedera-node/hedera-mono-service/               @hashgraph/hedera-services
 /hedera-node/hapi*/                             @hashgraph/hedera-services
 /hedera-node/hedera-admin*/                     @hashgraph/hedera-services @kimbor @povolev15
-/hedera-node/hedera-app*/                       @hashgraph/hedera-services @hashgraph/platform-base
+/hedera-node/hedera-app*/                       @hashgraph/hedera-base
 /hedera-node/hedera-consensus*/                 @hashgraph/hedera-services @povolev15 @iwsimon
 /hedera-node/hedera-evm*/                       @hashgraph/hedera-smart-contracts
 /hedera-node/hedera-file*/                      @hashgraph/hedera-services @povolev15 @iwsimon
@@ -77,7 +77,7 @@
 /gradle/                                        @hashgraph/release-engineering @hashgraph/release-engineering-managers
 gradlew                                         @hashgraph/release-engineering @hashgraph/release-engineering-managers
 gradlew.bat                                     @hashgraph/release-engineering @hashgraph/release-engineering-managers
-**/buildSrc/                                    @hashgraph/release-engineering @hashgraph/release-engineering-managers
+**/build-logic/                                 @hashgraph/release-engineering @hashgraph/release-engineering-managers
 **/gradle.*                                     @hashgraph/release-engineering @hashgraph/release-engineering-managers
 **/*.gradle.*                                   @hashgraph/release-engineering @hashgraph/release-engineering-managers
 

diff --git a/.github/workflows/node-flow-deploy-release-artifact.yaml b/.github/workflows/node-flow-deploy-release-artifact.yaml
@@ -18,20 +18,6 @@ name: "Node: Deploy Release Artifact"
 on:
   workflow_dispatch:
     inputs:
-      #      new-version:
-      #        description: "New Version:"
-      #        type: string
-      #        required: false
-      #        default: ""
-      #      trigger-env-deploy:
-      #        description: "Deploy to Environment:"
-      #        type: choice
-      #        required: true
-      #        options:
-      #          - none
-      #          - integration
-      #          - preview
-      #        default: none
       dry-run-enabled:
         description: "Perform Dry Run"
         type: boolean
@@ -68,13 +54,10 @@ jobs:
     if: ${{ github.event_name == 'workflow_dispatch' }}
     uses: ./.github/workflows/node-zxc-build-release-artifact.yaml
     with:
-      #      version-policy: ${{ github.event.inputs.new-verison != '' && 'specified' || 'branch-commit' }}
       version-policy: branch-commit
-      #      new-version: ${{ github.event.inputs.new-version }}
-      #      trigger-env-deploy: ${{ github.event.inputs.trigger-env-deploy }}
       trigger-env-deploy: none
       dry-run-enabled: ${{ github.event.inputs.dry-run-enabled == 'true' }}
-      java-version: ${{ github.event.inputs.java-version || '17.0.3' }}
+      java-version: ${{ github.event.inputs.java-version || '17.0.7' }}
       java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }}
       gradle-version: ${{ github.event.inputs.gradle-version || 'wrapper' }}
 
@@ -201,11 +184,11 @@ jobs:
           REQ_JSON="$(jq --compact-output --null-input \
                       --arg ref "${{ github.ref }}" \
                       --arg jdist "${{ github.event.inputs.java-distribution || 'temurin' }}" \
-                      --arg jver "${{ github.event.inputs.java-version || '17.0.3' }}" \
+                      --arg jver "${{ github.event.inputs.java-version || '17.0.7' }}" \
                       --arg gver "${{ github.event.inputs.gradle-version || 'wrapper' }}" \
                       --arg vpol "${VERSION_POLICY}" \
                       --arg vnum "${VERSION_NUM}" \
-                      '{"ref": $ref, "java": {"distribution": $jdist, "version": $jver}, "gradle": {"version": $gver}, "release": {"version": {"policy": $vpol, "number": $vnum}}}')"
+                      '{"mode": "new", "ref": $ref, "java": {"distribution": $jdist, "version": $jver}, "gradle": {"version": $gver}, "release": {"version": {"policy": $vpol, "number": $vnum}}}')"
 
           echo "payload=${REQ_JSON}" >>"${GITHUB_OUTPUT}"
           printf "## Dispatch Payload\n\`\`\`json\n%s\n\`\`\`\n" "$(jq '.' <<<"${REQ_JSON}")" >>"${GITHUB_STEP_SUMMARY}"

diff --git a/.github/workflows/node-flow-pull-request-checks.yaml b/.github/workflows/node-flow-pull-request-checks.yaml
@@ -22,7 +22,6 @@ on:
       - opened
       - reopened
       - synchronize
-      - labeled
 
 defaults:
   run:
@@ -55,20 +54,9 @@ jobs:
     secrets:
       access-token: ${{ secrets.GITHUB_TOKEN }}
 
-  unit-label-check:
-    name: "Label Check [CI:UnitTests]"
-    runs-on: [self-hosted, Linux, medium, ephemeral]
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'CI:UnitTests') || contains(github.event.pull_request.labels.*.name, 'CI:FinalChecks') }}
-    steps:
-      - name: Check Labels
-        if: github.event_name == 'pull_request'
-        run: echo PR labels that trigger the tests are [CI:UnitTests] and [CI:FinalChecks]
-
   unit-tests:
     name: Unit Tests
     uses: ./.github/workflows/node-zxc-compile-application-code.yaml
-    needs:
-      - unit-label-check
     with:
       custom-job-label: Standard
       enable-javadoc: false
@@ -83,8 +71,6 @@ jobs:
   eet-tests:
     name: E2E Tests
     uses: ./.github/workflows/node-zxc-compile-application-code.yaml
-    needs:
-      - unit-label-check
     with:
       custom-job-label: Standard
       enable-javadoc: false
@@ -100,8 +86,6 @@ jobs:
   integration-tests:
     name: Integration Tests
     uses: ./.github/workflows/node-zxc-compile-application-code.yaml
-    needs:
-      - unit-label-check
     with:
       custom-job-label: Standard
       enable-javadoc: false
@@ -117,8 +101,6 @@ jobs:
   snyk-scan:
     name: Snyk Scan
     uses: ./.github/workflows/node-zxc-compile-application-code.yaml
-    needs:
-      - unit-label-check
     with:
       custom-job-label: Standard
       enable-javadoc: false

diff --git a/.github/workflows/platform-flow-pull-request-checks.yaml b/.github/workflows/platform-flow-pull-request-checks.yaml
@@ -22,7 +22,6 @@ on:
       - opened
       - reopened
       - synchronize
-      - labeled
     paths:
       - 'platform-sdk/**'
 
@@ -58,24 +57,9 @@ jobs:
     secrets:
       access-token: ${{ secrets.PLATFORM_GH_ACCESS_TOKEN }}
 
-  unit-label-check:
-    name: "Label Check [CI:UnitTests]"
-    runs-on: [self-hosted, Linux, small, scheduler, ephemeral]
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'CI:UnitTests') || contains(github.event.pull_request.labels.*.name, 'CI:FinalChecks') }}
-    steps:
-      - name: "Check Labels"
-        uses: jesusvasquez333/[email protected]
-        if: github.event_name == 'pull_request'
-        with:
-          github-token: ${{ secrets.PLATFORM_GH_ACCESS_TOKEN }}
-          valid-labels: "CI:UnitTests, CI:FinalChecks"
-          disable-reviews: true
-
   unit-tests:
     name: Unit Tests
     uses: ./.github/workflows/platform-zxc-compile-platform-code.yaml
-    needs:
-      - unit-label-check
     with:
       custom-job-label: Standard
       enable-javadoc: false
@@ -87,24 +71,9 @@ jobs:
       sonar-token: ${{ secrets.PLATFORM_SONAR_TOKEN }}
       slack-api-token: ${{ secrets.PLATFORM_SLACK_API_TOKEN }}
 
-  final-label-check:
-    name: "Label Check [CI:FinalChecks]"
-    runs-on: [self-hosted, Linux, small, scheduler, ephemeral]
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'CI:FinalChecks') }}
-    steps:
-      - name: "Check Labels"
-        uses: jesusvasquez333/[email protected]
-        if: github.event_name == 'pull_request'
-        with:
-          github-token: ${{ secrets.PLATFORM_GH_ACCESS_TOKEN }}
-          valid-labels: "CI:FinalChecks"
-          disable-reviews: true
-
   abbreviated-panel:
     name: JRS Panel
     uses: ./.github/workflows/zxc-jrs-regression.yaml
-    needs:
-      - final-label-check
     with:
       panel-config: "configs/suites/GCP-PRCheck-Abbrev-4N.json"
       branch-name: ${{ github.head_ref || github.ref_name }}

diff --git a/.github/workflows/platform-pull-request-extended-checks.yaml b/.github/workflows/platform-pull-request-extended-checks.yaml
@@ -17,40 +17,55 @@
 name: "Platform: PR Extended Checks"
 on:
   workflow_dispatch:
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - labeled
+    slack-results-channel:
+      description: "Slack Test Result Channel:"
+      required: false
+      type: string
+      default: "regression-test"
+    slack-summary-channel:
+      description: "Slack Summary Channel:"
+      required: false
+      type: string
+      default: "regression-test"
+    java-version:
+      description: "Java JDK Version:"
+      type: string
+      required: false
+      default: "17"
+    java-distribution:
+      description: "Java JDK Distribution:"
+      type: string
+      required: false
+      default: "temurin"
+    gradle-version:
+      description: "Gradle Version:"
+      type: string
+      required: false
+      default: "wrapper"
 
 defaults:
   run:
     shell: bash
 
 concurrency:
-  group: pr-checks-${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  group: pr-ext-checks-${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
-  label-check:
-    name: "Label Check [CI:PlatformExtendedChecks]"
-    runs-on: [self-hosted, Linux, medium, ephemeral]
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'CI:PlatformExtendedChecks') }}
-    steps:
-      - name: Check Labels
-        if: github.event_name == 'pull_request'
-        run: echo PR labels that trigger the tests is [CI:PlatformExtendedChecks]
-
   reconnect:
     name: Reconnect
     uses: ./.github/workflows/zxc-jrs-regression.yaml
-    needs:
-      - label-check
     with:
-      ref: ${{ github.event.inputs.ref }}
-      branch-name: ${{ github.event.inputs.branch-name }}
       panel-config: "configs/suites/daily/4N/GCP-Daily-Reconnect-4N.json"
+      ref: ${{ github.event.inputs.ref || github.ref }}
+      branch-name: ${{ github.ref_name }}
+      slack-results-channel: ${{ github.event.inputs.slack-results-channel }}
+      slack-summary-channel: ${{ github.event.inputs.slack-summary-channel }}
+      java-version: ${{ github.event.inputs.java-version || '17' }}
+      java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }}
+      gradle-version: ${{ github.event.inputs.gradle-version || 'wrapper' }}
+      use-branch-for-slack-channel: false
+      custom-job-name: "Custom"
     secrets:
       access-token: ${{ secrets.PLATFORM_GH_ACCESS_TOKEN }}
       jrs-ssh-user-name: ${{ secrets.PLATFORM_JRS_SSH_USER_NAME }}
@@ -62,12 +77,17 @@ jobs:
   restart:
     name: Restart
     uses: ./.github/workflows/zxc-jrs-regression.yaml
-    needs:
-      - label-check
     with:
-      ref: ${{ github.event.inputs.ref }}
-      branch-name: ${{ github.event.inputs.branch-name }}
       panel-config: "configs/suites/daily/4N/GCP-Daily-Restart-4N.json"
+      ref: ${{ github.event.inputs.ref || github.ref }}
+      branch-name: ${{ github.ref_name }}
+      slack-results-channel: ${{ github.event.inputs.slack-results-channel }}
+      slack-summary-channel: ${{ github.event.inputs.slack-summary-channel }}
+      java-version: ${{ github.event.inputs.java-version || '17' }}
+      java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }}
+      gradle-version: ${{ github.event.inputs.gradle-version || 'wrapper' }}
+      use-branch-for-slack-channel: false
+      custom-job-name: "Custom"
     secrets:
       access-token: ${{ secrets.PLATFORM_GH_ACCESS_TOKEN }}
       jrs-ssh-user-name: ${{ secrets.PLATFORM_JRS_SSH_USER_NAME }}
@@ -79,12 +99,17 @@ jobs:
   dynamic-freeze:
     name: DynamicFreeze
     uses: ./.github/workflows/zxc-jrs-regression.yaml
-    needs:
-      - label-check
     with:
-      ref: ${{ github.event.inputs.ref }}
-      branch-name: ${{ github.event.inputs.branch-name }}
       panel-config: "configs/suites/daily/4N/GCP-Daily-DynamicFreeze-4N.json"
+      ref: ${{ github.event.inputs.ref || github.ref }}
+      branch-name: ${{ github.ref_name }}
+      slack-results-channel: ${{ github.event.inputs.slack-results-channel }}
+      slack-summary-channel: ${{ github.event.inputs.slack-summary-channel }}
+      java-version: ${{ github.event.inputs.java-version || '17' }}
+      java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }}
+      gradle-version: ${{ github.event.inputs.gradle-version || 'wrapper' }}
+      use-branch-for-slack-channel: false
+      custom-job-name: "Custom"
     secrets:
       access-token: ${{ secrets.PLATFORM_GH_ACCESS_TOKEN }}
       jrs-ssh-user-name: ${{ secrets.PLATFORM_JRS_SSH_USER_NAME }}
@@ -96,12 +121,17 @@ jobs:
   NewNodesSimilarStake:
     name: NewNodesSimilarStake
     uses: ./.github/workflows/zxc-jrs-regression.yaml
-    needs:
-      - label-check
     with:
-      ref: ${{ github.event.inputs.ref }}
-      branch-name: ${{ github.event.inputs.branch-name }}
       panel-config: "configs/suites/daily/5N/GCP-Daily-RestartWithNewNodes-SimilarStake-5N.json"
+      ref: ${{ github.event.inputs.ref || github.ref }}
+      branch-name: ${{ github.ref_name }}
+      slack-results-channel: ${{ github.event.inputs.slack-results-channel }}
+      slack-summary-channel: ${{ github.event.inputs.slack-summary-channel }}
+      java-version: ${{ github.event.inputs.java-version || '17' }}
+      java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }}
+      gradle-version: ${{ github.event.inputs.gradle-version || 'wrapper' }}
+      use-branch-for-slack-channel: false
+      custom-job-name: "Custom"
     secrets:
       access-token: ${{ secrets.PLATFORM_GH_ACCESS_TOKEN }}
       jrs-ssh-user-name: ${{ secrets.PLATFORM_JRS_SSH_USER_NAME }}

diff --git a/README.md b/README.md
@@ -7,17 +7,15 @@
 
 # Hedera Services
 
-Implementation of the [services offered](https://github.com/hashgraph/hedera-protobufs) by
-nodes in the Hedera public network, which is built on the Platform.
+Implementation of the Platform and the [services offered](https://github.com/hashgraph/hedera-protobufs) by
+nodes in the [Hedera public network](https://hedera.com).
 
 ## Overview of child modules
+* platform-sdk/_ - the basic Platform.
 * _hedera-node/_ - implementation of Hedera services on the Platform.
-* _test-clients/_ - clients and frameworks for end-to-end testing of Services.
-* _hapi-fees/_ - libraries to estimate resource usage of Services operations.
-* _hapi-utils/_ - deprecated libraries primarily involved in fee calculation.
 
 ## JVM
-JDK 17 is required. Adoptium builds of OpenJDK 17 are strongly recommended.
+JDK 17 is required. The Temurin builds of [Eclipse Adoptium](https://adoptium.net/) are strongly recommended.
 
 ## Solidity
 Hedera Contracts support `pragma solidity <=0.8.9`.

diff --git a/buildSrc/build.gradle.kts → build-logic/build.gradle.kts b/buildSrc/build.gradle.kts → build-logic/build.gradle.kts
@@ -35,6 +35,6 @@ dependencies {
     implementation("net.swiftzer.semver:semver:1.1.2")
     implementation("org.gradlex:extra-java-module-info:1.4")
     implementation("org.gradlex:java-ecosystem-capabilities:1.1")
-    implementation("org.gradlex:java-module-dependencies:1.3")
+    implementation("org.gradlex:java-module-dependencies:1.3.1")
     implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.5.0.2730")
 }
diff --git a/...tlin/RepairDashedCommentsFormatterStep.kt → ...tlin/RepairDashedCommentsFormatterStep.kt b/...tlin/RepairDashedCommentsFormatterStep.kt → ...tlin/RepairDashedCommentsFormatterStep.kt
diff --git a/...in/kotlin/StripOldLicenseFormatterStep.kt → ...in/kotlin/StripOldLicenseFormatterStep.kt b/...in/kotlin/StripOldLicenseFormatterStep.kt → ...in/kotlin/StripOldLicenseFormatterStep.kt
diff --git a/buildSrc/src/main/kotlin/Utils.kt → build-logic/src/main/kotlin/Utils.kt b/buildSrc/src/main/kotlin/Utils.kt → build-logic/src/main/kotlin/Utils.kt
diff --git a/...ra.hashgraph.aggregate-reports.gradle.kts → ...ra.hashgraph.aggregate-reports.gradle.kts b/...ra.hashgraph.aggregate-reports.gradle.kts → ...ra.hashgraph.aggregate-reports.gradle.kts
diff --git a/...ashgraph.benchmark-conventions.gradle.kts → ...ashgraph.benchmark-conventions.gradle.kts b/...ashgraph.benchmark-conventions.gradle.kts → ...ashgraph.benchmark-conventions.gradle.kts
diff --git a/...m.hedera.hashgraph.conventions.gradle.kts → ...m.hedera.hashgraph.conventions.gradle.kts b/...m.hedera.hashgraph.conventions.gradle.kts → ...m.hedera.hashgraph.conventions.gradle.kts
@@ -74,6 +74,32 @@ repositories {
     }
 }
 
+val internal: Configuration = configurations.create("internal") {
+    isCanBeConsumed = false
+    isCanBeResolved = false
+}
+
+dependencies {
+    "internal"(platform("com.hedera.hashgraph:hedera-platform"))
+}
+javaModuleDependencies {
+    versionsFromConsistentResolution(":app")
+}
+configurations.getByName("mainRuntimeClasspath") {
+    extendsFrom(internal)
+}
+sourceSets.all {
+    configurations.getByName(annotationProcessorConfigurationName) {
+        extendsFrom(internal)
+    }
+    configurations.getByName(compileClasspathConfigurationName) {
+        extendsFrom(internal)
+    }
+    configurations.getByName(runtimeClasspathConfigurationName) {
+        extendsFrom(internal)
+    }
+}
+
 // Make sure we use UTF-8 encoding when compiling
 tasks.withType<JavaCompile>().configureEach {
     options.encoding = "UTF-8"

diff --git a/....hashgraph.dependency-analysis.gradle.kts → ....hashgraph.dependency-analysis.gradle.kts b/....hashgraph.dependency-analysis.gradle.kts → ....hashgraph.dependency-analysis.gradle.kts