Merge branch 'main' into deps-gradle-convnetions-0.3.4

hiero-ledger · Feb 14, 2025 · 5b5f8f8 · 5b5f8f8
2 parents c336ba8 + 816cfee
commit 5b5f8f8
Show file tree

Hide file tree

Showing 25 changed files with 147 additions and 131 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/workflows/flow-node-performance-tests.yaml b/.github/workflows/flow-node-performance-tests.yaml
@@ -45,7 +45,7 @@ permissions:
 jobs:
   canonical-test:
     name: Canonical (10 hour)
-    runs-on: network-node-linux-medium
+    runs-on: hiero-network-node-linux-medium
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4

diff --git a/.github/workflows/flow-pull-request-formatting.yaml b/.github/workflows/flow-pull-request-formatting.yaml
@@ -43,7 +43,7 @@ permissions:
 jobs:
   title-check:
     name: Title Check
-    runs-on: network-node-linux-medium
+    runs-on: hiero-network-node-linux-medium
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
@@ -57,7 +57,7 @@ jobs:
 
   milestone-check:
     name: Milestone Check
-    runs-on: network-node-linux-medium
+    runs-on: hiero-network-node-linux-medium
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
@@ -72,7 +72,7 @@ jobs:
 
   assignee-check:
     name: Assignee Check
-    runs-on: network-node-linux-medium
+    runs-on: hiero-network-node-linux-medium
 
     steps:
       - name: Harden Runner

diff --git a/.github/workflows/node-flow-build-application.yaml b/.github/workflows/node-flow-build-application.yaml
@@ -85,7 +85,7 @@ jobs:
 
   deploy-ci-trigger:
     name: Trigger CI Flows
-    runs-on: network-node-linux-medium
+    runs-on: hiero-network-node-linux-medium
     needs: code
     if: ${{ needs.code.result == 'success' }}
     steps:
@@ -98,7 +98,7 @@ jobs:
         uses: step-security/workflow-dispatch@4d1049025980f72b1327cbfdeecb07fe7a20f577 # v1.2.4
         with:
           workflow: .github/workflows/node-flow-deploy-release-artifact.yaml
-          repo: hashgraph/hedera-services # ensure we are executing in the hashgraph org
+          repo: hiero-ledger/hiero-consensus-node # ensure we are executing in the hiero-ledger org
           ref: main # ensure we are always using the workflow definition from the main branch
           token: ${{ secrets.GH_ACCESS_TOKEN }}
           inputs: '{

diff --git a/.github/workflows/node-flow-deploy-preview.yaml b/.github/workflows/node-flow-deploy-preview.yaml
@@ -35,7 +35,7 @@ defaults:
 jobs:
   prepare-deploy-preview:
     name: Prepare for Deploy
-    runs-on: network-node-linux-medium
+    runs-on: hiero-network-node-linux-medium
     outputs:
       version: ${{ steps.tag.outputs.version }}
       prerelease: ${{ steps.tag.outputs.prerelease }}

diff --git a/.github/workflows/node-flow-deploy-release-artifact.yaml b/.github/workflows/node-flow-deploy-release-artifact.yaml
@@ -37,7 +37,7 @@ permissions:
 jobs:
   prepare-tag-release:
     name: Prepare Release [Tag]
-    runs-on: network-node-linux-medium
+    runs-on: hiero-network-node-linux-medium
     if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
     outputs:
       version: ${{ steps.tag.outputs.version }}
@@ -130,7 +130,7 @@ jobs:
 
   deploy-ci-trigger:
     name: Trigger CI Flows
-    runs-on: network-node-linux-medium
+    runs-on: hiero-network-node-linux-medium
     needs:
       - release-branch
     steps:
@@ -162,7 +162,7 @@ jobs:
         uses: step-security/workflow-dispatch@4d1049025980f72b1327cbfdeecb07fe7a20f577 # v1.2.4
         with:
           workflow: .github/workflows/zxf-prepare-extended-test-suite.yaml
-          repo: hashgraph/hedera-services # ensure we are executing in the hashgraph org
+          repo: hiero-ledger/hiero-consensus-node # ensure we are executing in the hiero-ledger org
           ref: main # ensure we are always using the workflow definition from the main branch
           token: ${{ secrets.GH_ACCESS_TOKEN }}
           inputs: '{ "ref": "${{ inputs.ref }}" }'
@@ -183,7 +183,7 @@ jobs:
         uses: step-security/workflow-dispatch@4d1049025980f72b1327cbfdeecb07fe7a20f577 # v1.2.4
         with:
           workflow: .github/workflows/node-zxf-deploy-integration.yaml
-          repo: hashgraph/hedera-services # ensure we are executing in the hashgraph org
+          repo: hiero-ledger/hiero-consensus-node # ensure we are executing in the hiero-ledger org
           ref: main # ensure we are always using the workflow definition from the main branch
           token: ${{ secrets.GH_ACCESS_TOKEN }}
           inputs: '{
@@ -192,7 +192,7 @@ jobs:
 
   update-hedera-protobufs:
     name: Update Hedera Protobufs
-    runs-on: network-node-linux-medium
+    runs-on: hiero-network-node-linux-medium
     needs:
       - prepare-tag-release
     steps:

diff --git a/.github/workflows/node-zxc-build-release-artifact.yaml b/.github/workflows/node-zxc-build-release-artifact.yaml
@@ -117,7 +117,7 @@ permissions:
 jobs:
   validate:
     name: Validate
-    runs-on: network-node-linux-large
+    runs-on: hiero-network-node-linux-large
     if: ${{ !github.event.workflow_call.repository.fork }}
     outputs:
       branch-name: ${{ steps.parameters.outputs.branch-name }}
@@ -221,7 +221,7 @@ jobs:
 
   build-artifact:
     name: Build Artifact
-    runs-on: network-node-linux-large
+    runs-on: hiero-network-node-linux-large
     needs:
       - validate
     steps:
@@ -379,7 +379,7 @@ jobs:
 
   local-node-images:
     name: Publish Local Node Images
-    runs-on: network-node-linux-large
+    runs-on: hiero-network-node-linux-large
     needs:
       - validate
       - build-artifact
@@ -553,7 +553,7 @@ jobs:
 
   validate-production-image:
     name: Validate Production Image
-    runs-on: network-node-linux-large
+    runs-on: hiero-network-node-linux-large
     needs:
       - gcp-production-image
       - jfr-production-image
@@ -667,7 +667,7 @@ jobs:
 
   publish:
     name: Publish to ${{ inputs.version-policy == 'specified' && 'Maven Central' || 'GCP Registry' }}
-    runs-on: network-node-linux-large
+    runs-on: hiero-network-node-linux-large
     needs:
       - validate
     if: ${{ inputs.release-profile != 'none' }}
@@ -832,7 +832,7 @@ jobs:
 
   send-notifications:
     name: Send Release Notifications
-    runs-on: network-node-linux-large
+    runs-on: hiero-network-node-linux-large
     needs:
       - validate
       - local-node-images

diff --git a/.github/workflows/node-zxc-compile-application-code.yaml b/.github/workflows/node-zxc-compile-application-code.yaml
@@ -159,7 +159,7 @@ env:
 jobs:
   compile:
     name: ${{ inputs.custom-job-label || 'Compiles' }}
-    runs-on: network-node-linux-large
+    runs-on: hiero-network-node-linux-large
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
@@ -569,8 +569,6 @@ jobs:
           touch build.gradle.kts
 
       - name: Setup Snyk
-        env:
-          SNYK_TOKEN: ${{ secrets.snyk-token }}
         if: >-
           ${{
             inputs.enable-snyk-scan &&
@@ -584,6 +582,20 @@ jobs:
           }}
         run: ${CG_EXEC} npm install -g snyk snyk-to-html @wcj/html-to-markdown-cli
 
+      - name: Snyk Version
+        if: >-
+          ${{
+            inputs.enable-snyk-scan &&
+            steps.gradle-build.conclusion == 'success' &&
+            (
+              github.event.pull_request.head.repo.full_name == github.repository ||
+              github.event_name == 'push' ||
+              github.event_name == 'workflow_dispatch'
+            ) &&
+            !cancelled()
+          }}
+        run: snyk --version
+
       - name: Snyk Scan
         id: snyk
         env:
@@ -599,7 +611,7 @@ jobs:
             ) &&
             !cancelled()
           }}
-        run: ${CG_EXEC} snyk test --all-sub-projects --severity-threshold=high --policy-path=.snyk --json-file-output=snyk-test.json --org=hedera-services
+        run: ${CG_EXEC} snyk test --all-sub-projects --severity-threshold=high --policy-path=.snyk --json-file-output=snyk-test.json --org=hiero-consensus-node
 
       - name: Snyk Code
         id: snyk-code
@@ -616,7 +628,7 @@ jobs:
             ) &&
             !cancelled()
           }}
-        run: ${CG_EXEC} snyk code test --severity-threshold=high --json-file-output=snyk-code.json --org=hedera-services
+        run: ${CG_EXEC} snyk code test --severity-threshold=high --json-file-output=snyk-code.json --org=hiero-consensus-node
 
       - name: Publish Snyk Results
         if: >-

diff --git a/.github/workflows/node-zxc-deploy-preview.yaml b/.github/workflows/node-zxc-deploy-preview.yaml
@@ -57,7 +57,7 @@ permissions:
 jobs:
   Deploy-Preview:
     name: ${{ inputs.custom-job-label || 'Deploy Preview' }}
-    runs-on: network-node-linux-large
+    runs-on: hiero-network-node-linux-large
     if: ${{ !github.event.workflow_call.repository.fork }}
     outputs:
       version: ${{ steps.effective-version.outputs.number }}

diff --git a/.github/workflows/node-zxcron-main-fsts-regression.yaml b/.github/workflows/node-zxcron-main-fsts-regression.yaml
@@ -25,7 +25,7 @@ defaults:
 jobs:
   trigger-task:
     name: Trigger Daily Run
-    runs-on: network-node-linux-small-scheduler
+    runs-on: hiero-network-node-linux-small-scheduler
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4

diff --git a/.github/workflows/node-zxcron-release-branching.yaml b/.github/workflows/node-zxcron-release-branching.yaml
@@ -36,7 +36,7 @@ env:
 jobs:
   check-trigger:
     name: Check Trigger Conditions
-    runs-on: network-node-linux-small-scheduler
+    runs-on: hiero-network-node-linux-small-scheduler
     if: ${{ !github.event.workflow_dispatch.repository.fork }}
     outputs:
       triggered: ${{ steps.evaluate.outputs.triggered }}
@@ -81,7 +81,7 @@ jobs:
 
   check-branch:
     name: Check Branching Conditions
-    runs-on: network-node-linux-small-scheduler
+    runs-on: hiero-network-node-linux-small-scheduler
     needs:
       - check-trigger
     outputs:
@@ -110,7 +110,7 @@ jobs:
 
   create-branch:
     name: Create Release Branch
-    runs-on: network-node-linux-small-scheduler
+    runs-on: hiero-network-node-linux-small-scheduler
     needs:
       - check-branch
 
@@ -207,7 +207,7 @@ jobs:
 
   create-tag:
     name: Create Release Tag
-    runs-on: network-node-linux-medium
+    runs-on: hiero-network-node-linux-medium
     needs:
       - check-branch
       - create-branch
@@ -325,11 +325,11 @@ jobs:
                           },
                           {
                             "type": "mrkdwn",
-                            "text": "<${{ github.server_url }}/hashgraph/hedera-services/tree/v${{ steps.version.outputs.number }}|v${{ steps.version.outputs.number }}>"
+                            "text": "<${{ github.server_url }}/hiero-ledger/hiero-consensus-node/tree/v${{ steps.version.outputs.number }}|v${{ steps.version.outputs.number }}>"
                           },
                           {
                             "type": "mrkdwn",
-                            "text": "<${{ github.server_url }}/hashgraph/hedera-services/tree/${{ needs.check-branch.outputs.branch-name }}|${{ needs.check-branch.outputs.branch-name }}>"
+                            "text": "<${{ github.server_url }}/hiero-ledger/hiero-consensus-node/tree/${{ needs.check-branch.outputs.branch-name }}|${{ needs.check-branch.outputs.branch-name }}>"
                           }
                         ]
                       },

diff --git a/.github/workflows/node-zxcron-release-fsts-regression.yaml b/.github/workflows/node-zxcron-release-fsts-regression.yaml
@@ -31,7 +31,7 @@ permissions:
 jobs:
   cron:
     name: Cron / Launch Workflows
-    runs-on: network-node-linux-small-scheduler
+    runs-on: hiero-network-node-linux-small-scheduler
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4

diff --git a/.github/workflows/node-zxf-deploy-integration.yaml b/.github/workflows/node-zxf-deploy-integration.yaml
@@ -28,7 +28,7 @@ permissions:
 jobs:
   jenkins-checks:
     name: Build Artifact
-    runs-on: network-node-linux-medium
+    runs-on: hiero-network-node-linux-medium
     if: ${{ !github.event.workflow_dispatch.repository.fork }}
     steps:
       - name: Harden Runner

diff --git a/.github/workflows/node-zxf-snyk-monitor.yaml b/.github/workflows/node-zxf-snyk-monitor.yaml
@@ -29,7 +29,9 @@ permissions:
 jobs:
   snyk:
     name: Snyk Monitor
-    runs-on: network-node-linux-medium
+    runs-on: hiero-network-node-linux-large
+    # turn off snyk monitor job until we can look at and fix aggregation of data
+    if: ${{ false }}
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
@@ -48,7 +50,6 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
         with:
-          build-root-directory: hedera-node
           gradle-version: wrapper
 
       - name: Compile
@@ -68,7 +69,6 @@ jobs:
         run: npm install -g snyk
 
       - name: Run Snyk Monitor
-        continue-on-error: true
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-        run: snyk monitor --all-sub-projects --policy-path=.snyk --trust-policies
+        run: snyk monitor --all-projects --policy-path=.snyk --trust-policies --org=hiero-consensus-node --debug
diff --git a/.github/workflows/platform-zxc-launch-jrs-workflow.yaml b/.github/workflows/platform-zxc-launch-jrs-workflow.yaml
@@ -53,7 +53,7 @@ defaults:
 jobs:
   launch-workflow:
     name: Launch Workflow
-    runs-on: network-node-linux-small-scheduler
+    runs-on: hiero-network-node-linux-small-scheduler
     if: ${{ !github.event.workflow_call.repository.fork }}
     steps:
       - name: Harden Runner

diff --git a/.github/workflows/platform-zxcron-main-jrs-regression.yaml b/.github/workflows/platform-zxcron-main-jrs-regression.yaml
@@ -27,7 +27,7 @@ defaults:
 jobs:
   trigger-task:
     name: Trigger Daily Run
-    runs-on: network-node-linux-small-scheduler
+    runs-on: hiero-network-node-linux-small-scheduler
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4

diff --git a/.github/workflows/platform-zxcron-release-jrs-regression.yaml b/.github/workflows/platform-zxcron-release-jrs-regression.yaml
@@ -33,7 +33,7 @@ env:
 jobs:
   cron:
     name: Cron / Launch Workflows
-    runs-on: network-node-linux-small-scheduler
+    runs-on: hiero-network-node-linux-small-scheduler
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4

diff --git a/.github/workflows/zxc-jrs-regression.yaml b/.github/workflows/zxc-jrs-regression.yaml
@@ -183,7 +183,7 @@ permissions:
 jobs:
   jrs-regression:
     name: ${{ inputs.custom-job-name || 'Standard' }}
-    runs-on: network-node-linux-large
+    runs-on: hiero-network-node-linux-large
     if: ${{ !github.event.workflow_call.repository.fork }}
     steps:
       - name: Harden Runner

diff --git a/.github/workflows/zxc-publish-production-image.yaml b/.github/workflows/zxc-publish-production-image.yaml
@@ -79,7 +79,7 @@ permissions:
 jobs:
   publish-image:
     name: ${{ inputs.custom-job-name || 'Publish Production Image (GCP)' }}
-    runs-on: network-node-linux-large
+    runs-on: hiero-network-node-linux-large
     if: ${{ !github.event.workflow_call.repository.fork }}
     outputs:
       docker-registry: ${{ steps.set-registry.outputs.docker-registry }}

diff --git a/.github/workflows/zxc-verify-docker-build-determinism.yaml b/.github/workflows/zxc-verify-docker-build-determinism.yaml
@@ -63,7 +63,7 @@ env:
 jobs:
   generate-baseline:
     name: Generate Baseline
-    runs-on: network-node-linux-medium
+    runs-on: hiero-network-node-linux-medium
     outputs:
       sha: ${{ steps.commit.outputs.sha }}
       sha-abbrev: ${{ steps.commit.outputs.sha-abbrev }}
@@ -234,8 +234,8 @@ jobs:
           #- ubuntu-20.04
           #- macos-12
           #- macos-11
-          - network-node-linux-medium
-          - network-node-linux-large
+          - hiero-network-node-linux-medium
+          - hiero-network-node-linux-large
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4