Merge branch 'main' into timfn/21856-add-bn-service-client

Signed-off-by: Tim Farber-Newman <[email protected]>

Author: timfn-hg

.github/CODEOWNERS

@@ -71,8 +71,6 @@
 /platform-sdk/swirlds-common/                       @hiero-ledger/hiero-consensus-node-consensus-codeowners @hiero-ledger/hiero-consensus-node-foundation-codeowners
 /platform-sdk/swirlds-component-framework/          @hiero-ledger/hiero-consensus-node-consensus-codeowners
 /platform-sdk/swirlds-config-*/                     @hiero-ledger/hiero-consensus-node-foundation-codeowners
-/platform-sdk/swirlds-fchashmap/                    @hiero-ledger/hiero-consensus-node-foundation-codeowners
-/platform-sdk/swirlds-fcqueue/                      @hiero-ledger/hiero-consensus-node-foundation-codeowners
 /platform-sdk/swirlds-logging/                      @hiero-ledger/hiero-consensus-node-foundation-codeowners
 /platform-sdk/swirlds-logging-*/                    @hiero-ledger/hiero-consensus-node-foundation-codeowners
 /platform-sdk/swirlds-merkle/                       @hiero-ledger/hiero-consensus-node-foundation-codeowners

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

@@ -58,7 +58,7 @@ jobs:
 
       - name: Install Github CLI
         env:
-          GITHUB_TOKEN: ${{ secrets.PLATFORM_access-token }}
+          GITHUB_TOKEN: ${{ secrets.PLATFORM_GH_ACCESS_TOKEN }}
         run: |
           curl -O -L -s https://github.com/cli/cli/releases/download/v2.12.1/gh_2.12.1_linux_amd64.deb
           sudo apt install -y ./gh_2.12.1_linux_amd64.deb

…rkflows/support/citr/backPresureStats.pl …kflows/support/citr/backPressureStats.pl.github/workflows/support/citr/backPresureStats.pl renamed to .github/workflows/support/citr/backPressureStats.pl .github/workflows/support/citr/backPresureStats.pl renamed to .github/workflows/support/citr/backPressureStats.pl

@@ -0,0 +1,26 @@
+node_id=${1}
+
+ps -aef | grep -w stateAnalyzer | grep -v grep | grep stateAnalyzer >/dev/null
+if [[ ${?} -eq 0 ]]
+then
+  echo "Previous Validator is still running on ${node_id}"
+  exit 1
+fi
+
+cd /opt/hgcapp/services-hedera/HapiApp2.0/data/saved/validation.tmp
+currentRound=`ls -1t ../com.hedera.services.ServicesMain/${node_id}/123/ | head -n 1`
+
+java -Xms16g -Xmx64g -XX:+UnlockExperimentalVMOptions -XX:+UseZGC -XX:ZAllocationSpikeTolerance=2 -XX:ConcGCThreads=14 \
+     -XX:ZMarkStackSpaceLimit=16g -XX:MaxDirectMemorySize=32g -XX:NativeMemoryTracking=detail -XX:MetaspaceSize=100M \
+     -XX:+ZGenerational -Dthread.num=16 \
+     -jar /tmp/hedera-state-validator-*-all.jar ../com.hedera.services.ServicesMain/${node_id}/123/${currentRound} \
+     validate rehash stateAnalyzer account tokenRelations internal leaf > validatorRun.log 2>&1
+result=${?}
+if [[ ${result} -eq 0 ]]
+then
+  echo "Node: ${node_id} validation of round ${currentRound} is OK"
+  grep -i -E 'time.* taken' validator.log validatorRun.log
+else
+  echo "Node: ${node_id} validation of round ${currentRound} failed"
+fi
+exit ${result}

.github/workflows/support/citr/checkValidatorNode.sh

@@ -0,0 +1,11 @@
+%stat=();
+
+while (<>) {
+  if (/^\w+[\:]\d+$/) {
+    ($id, $counter)=split(/[\:]/,$_,2);
+    $stat{"$id"}{"counter"}+=$counter;
+  }
+}
+foreach $id (sort { $stat{$b}{"counter"} <=> $stat{$a}{"counter"} } keys (%stat) ) {
+  printf("%-35s %10d\n",$id,$stat{$id}{"counter"});
+}

.github/workflows/support/citr/collectNLG_Errors.pl

@@ -4,9 +4,9 @@ NODE_ROOT=/opt/hgcapp
 
 NofNodes=`kubectl -n ${NAMESPACE} get pods | grep 'network-node' | wc -l`
 
-for i in `seq 1 1 $NofNodes`
+for i in `seq 1 1 ${NofNodes}`
 do
-  kubectl -n ${NAMESPACE} exec network-node${i}-0 -c root-container -- bash -c "find $NODE_ROOT/*Streams/*/ -type f -mmin +59 -exec rm -f {} \;" >/dev/null 2>&1 &
+  kubectl -n ${NAMESPACE} exec network-node${i}-0 -c root-container -- bash -c "find ${NODE_ROOT}/*Streams/*/ -type f -mmin +59 -exec rm -f {} \;" >/dev/null 2>&1 &
 done
 
 wait
@@ -19,8 +19,9 @@ kubectl -n ${NAMESPACE} get secret minio-secrets -o yaml | grep 'config.env' | a
 username=`grep MINIO_ROOT_USER /tmp/.$$.tmp.s | awk -F = '{print $NF}'`
 userpwd=`grep MINIO_ROOT_PASSWORD /tmp/.$$.tmp.s | awk -F = '{print $NF}'`
 
-kubectl -n ${NAMESPACE} exec $nlgpod -- bash -c "if [ ! -f ./mc ]; then curl https://dl.min.io/client/mc/release/linux-amd64/mc -o mc; fi"
-kubectl -n ${NAMESPACE} exec $nlgpod -- bash -c "chmod a+rx ./mc"
-kubectl -n ${NAMESPACE} exec $nlgpod -- bash -c "./mc alias set myminio http://$minioIP:9000 $username $userpwd"
-kubectl -n ${NAMESPACE} exec $nlgpod -- bash -c "./mc rm --older-than 0d1h0s --recursive --versions --force myminio/solo-streams/ >/dev/null 2>&1"
-kubectl -n ${NAMESPACE} exec $nlgpod -- bash -c "./mc rm --older-than 0d1h0s --recursive --versions --force myminio/solo-backups/ >/dev/null 2>&1"
+kubectl -n ${NAMESPACE} exec ${nlgpod} -- bash -c "if [ ! -f ./mc ]; then curl https://dl.min.io/client/mc/release/linux-amd64/mc -o mc; fi"
+kubectl -n ${NAMESPACE} exec ${nlgpod} -- bash -c "chmod a+rx ./mc"
+kubectl -n ${NAMESPACE} exec ${nlgpod} -- bash -c "./mc alias set myminio http://${minioIP}:9000 ${username} ${userpwd}"
+kubectl -n ${NAMESPACE} exec ${nlgpod} -- bash -c "./mc rm --older-than 0d1h0s --recursive --versions --force myminio/solo-streams/ >/dev/null 2>&1"
+kubectl -n ${NAMESPACE} exec ${nlgpod} -- bash -c "./mc rm --older-than 0d1h0s --recursive --versions --force myminio/solo-backups/ >/dev/null 2>&1"
+

.github/workflows/support/citr/cronClean.sh

@@ -1,28 +1,28 @@
 NAMESPACE=$1
 NODE_ROOT=/opt/hgcapp/services-hedera/HapiApp2.0
-LOG_DIR=$NODE_ROOT/output
-STATS_DIR=$NODE_ROOT/data/stats
-CONFIG_DIR=$NODE_ROOT/data/config
+LOG_DIR=${NODE_ROOT}/output
+STATS_DIR=${NODE_ROOT}/data/stats
+CONFIG_DIR=${NODE_ROOT}/data/config
 
 TOOLDIR=`dirname $0`
 
 mkdir podlog_${NAMESPACE}
 
 NofNodes=`kubectl -n ${NAMESPACE} get pods | grep 'network-node' | wc -l`
 
-for i in `seq 1 1 $NofNodes`
+for i in `seq 1 1 ${NofNodes}`
 do
   sh ${TOOLDIR}/kubectlt -n ${NAMESPACE} exec -it network-node${i}-0 -c root-container -- \
-  bash -c "grep -h -i -E 'error|exception|warn' $LOG_DIR/*.log |grep -v -E 'error-|-error|exception-|-exception|exception[\=]' | grep -v 'The most likely causes'" > podlog_${NAMESPACE}/podlog_${NAMESPACE}_network-node${i}-errors.log
-  cat podlog_${NAMESPACE}/podlog_${NAMESPACE}_network-node${i}-errors.log | perl ${TOOLDIR}/backPresureStats.pl >> podlog_${NAMESPACE}/podlog_${NAMESPACE}_network-node${i}-errors.log
+  bash -c "grep -h -i -E 'error|exception|warn' ${LOG_DIR}/*.log | grep -v -E 'error-|-error|exception-|-exception|exception[\=]' | grep -v 'The most likely causes'" > podlog_${NAMESPACE}/podlog_${NAMESPACE}_network-node${i}-errors.log
+  cat podlog_${NAMESPACE}/podlog_${NAMESPACE}_network-node${i}-errors.log | perl ${TOOLDIR}/backPressureStats.pl >> podlog_${NAMESPACE}/podlog_${NAMESPACE}_network-node${i}-errors.log
 done
 
 cat podlog_${NAMESPACE}/podlog_${NAMESPACE}_network-node*-errors.log | grep -v -E 'exception[\=]null' |\
 perl -ne 'if (/^\d{4}[\-]\d{2}[\-]\d{2}\s+\d{2}[\:]\d{2}[\:]\d{2}[\.]\d+\s+\d+\s+(.*)$/) {print "$1\n";} else {print;}' | perl -pne '~s/\d+/N/g' |sort | uniq -c | sort -n -k 1 -r |\
 grep -v 'Report[\[]' | grep -v 'contracts.evm.chargeGasOnEvmHandleException [\=] true' > podlog_${NAMESPACE}/error_summary.txt
-cat podlog_${NAMESPACE}/podlog_${NAMESPACE}_network-node*-errors.log | perl ${TOOLDIR}/backPresureStats.pl >> podlog_${NAMESPACE}/error_summary.txt
+cat podlog_${NAMESPACE}/podlog_${NAMESPACE}_network-node*-errors.log | perl ${TOOLDIR}/backPressureStats.pl >> podlog_${NAMESPACE}/error_summary.txt
 
-for i in `seq 1 1 $NofNodes`
+for i in `seq 1 1 ${NofNodes}`
 do
   mkdir podlog_${NAMESPACE}/network-node${i}_logs
   mkdir podlog_${NAMESPACE}/network-node${i}_logs/stats
@@ -32,12 +32,12 @@ do
   sh ${TOOLDIR}/kubectlt -n ${NAMESPACE} exec -it network-node${i}-0 -c root-container -- bash -c "journalctl" > podlog_${NAMESPACE}/network-node${i}_logs/journalctl.log
 
   sh ${TOOLDIR}/kubectlt -n ${NAMESPACE} exec -it network-node${i}-0 -c root-container -- \
-  bash -c "cd $NODE_ROOT; cp gc.log* ./output/"
+  bash -c "cd ${NODE_ROOT}; cp gc.log* ./output/"
 
-  sh ${TOOLDIR}/kubectlt -n ${NAMESPACE} cp -c root-container network-node${i}-0:$LOG_DIR podlog_${NAMESPACE}/network-node${i}_logs
-  sh ${TOOLDIR}/kubectlt -n ${NAMESPACE} cp -c root-container network-node${i}-0:$STATS_DIR podlog_${NAMESPACE}/network-node${i}_logs/stats
-  sh ${TOOLDIR}/kubectlt -n ${NAMESPACE} cp -c root-container network-node${i}-0:$CONFIG_DIR podlog_${NAMESPACE}/network-node${i}_logs/config
-  sh ${TOOLDIR}/kubectlt -n ${NAMESPACE} cp -c root-container network-node${i}-0:$NODE_ROOT/config.txt podlog_${NAMESPACE}/network-node${i}_logs/config/config.txt
-  sh ${TOOLDIR}/kubectlt -n ${NAMESPACE} cp -c root-container network-node${i}-0:$NODE_ROOT/settingsUsed.txt podlog_${NAMESPACE}/network-node${i}_logs/config/settingsUsed.txt
+  sh ${TOOLDIR}/kubectlt -n ${NAMESPACE} cp -c root-container network-node${i}-0:${LOG_DIR} podlog_${NAMESPACE}/network-node${i}_logs
+  sh ${TOOLDIR}/kubectlt -n ${NAMESPACE} cp -c root-container network-node${i}-0:${STATS_DIR} podlog_${NAMESPACE}/network-node${i}_logs/stats
+  sh ${TOOLDIR}/kubectlt -n ${NAMESPACE} cp -c root-container network-node${i}-0:${CONFIG_DIR} podlog_${NAMESPACE}/network-node${i}_logs/config
+  sh ${TOOLDIR}/kubectlt -n ${NAMESPACE} cp -c root-container network-node${i}-0:${NODE_ROOT}/config.txt podlog_${NAMESPACE}/network-node${i}_logs/config/config.txt
+  sh ${TOOLDIR}/kubectlt -n ${NAMESPACE} cp -c root-container network-node${i}-0:${NODE_ROOT}/settingsUsed.txt podlog_${NAMESPACE}/network-node${i}_logs/config/settingsUsed.txt
 
 done

.github/workflows/support/citr/getClusterErrors.sh

@@ -192,15 +192,6 @@
         <!-- Beta Mirror -->
         <MarkerFilter marker="BETA_MIRROR_NODE"       onMatch="ACCEPT" onMismatch="NEUTRAL"/>
 
-        <!-- FCMap -->
-        <MarkerFilter marker="FCM_COPY"               onMatch="DENY"   onMismatch="NEUTRAL"/>
-        <MarkerFilter marker="FCM_COPY_FROM"          onMatch="DENY"   onMismatch="NEUTRAL"/>
-        <MarkerFilter marker="FCM_COPY_TO"            onMatch="DENY"   onMismatch="NEUTRAL"/>
-        <MarkerFilter marker="FCM_DEMO"               onMatch="DENY"   onMismatch="NEUTRAL"/>
-        <MarkerFilter marker="FCM_COPY_FROM_DIFF"     onMatch="DENY"   onMismatch="NEUTRAL"/>
-        <MarkerFilter marker="FCM_COPY_TO_DIFF"       onMatch="DENY"   onMismatch="NEUTRAL"/>
-        <MarkerFilter marker="FC_SERIALIZATION"       onMatch="DENY"   onMismatch="NEUTRAL"/>
-
         <!-- Merkle Trees & Hashing -->
         <MarkerFilter marker="MERKLE_FORCE_FLUSH"     onMatch="DENY"   onMismatch="NEUTRAL"/>
         <MarkerFilter marker="MERKLE_HASHING"         onMatch="DENY"   onMismatch="NEUTRAL"/>

.github/workflows/support/citr/log4j2.xml

@@ -1,11 +1,11 @@
 NAMESPACE=$1
 NODE_ROOT=/opt/hgcapp/services-hedera/HapiApp2.0
-LOG_DIR=$NODE_ROOT/output
+LOG_DIR=${NODE_ROOT}/output
 
 
 NofNodes=`kubectl -n ${NAMESPACE} get pods | grep 'network-node' | wc -l`
 
-for i in `seq 1 1 $NofNodes`
+for i in `seq 1 1 ${NofNodes}`
 do
-  kubectl -n ${NAMESPACE} exec -it network-node${i}-0 -c root-container -- bash -c "find $LOG_DIR -type f -name '*.log' -exec truncate -c -s 0 {} \;"
+  kubectl -n ${NAMESPACE} exec -it network-node${i}-0 -c root-container -- bash -c "find ${LOG_DIR} -type f -name '*.log' -exec truncate -c -s 0 {} \;"
 done

.github/workflows/support/citr/resetCNlogs.sh

@@ -0,0 +1,130 @@
+# SPDX-License-Identifier: Apache-2.0
+name: "ZXC: Build & Publish Hedera State Validator Uber JAR"
+
+on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: "Branch, tag, or commit to build"
+        required: false
+        type: string
+  workflow_call:
+    inputs:
+      ref:
+        description: "Branch, tag, or commit to build"
+        required: false
+        type: string
+    outputs:
+      gcs-uri:
+        description: "GCS URI of the published uber JAR"
+        value: ${{ jobs.build-publish.outputs.gcs-uri }}
+
+permissions:
+  contents: read
+  id-token: write
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build-publish:
+    name: Build & Publish State Validator Uber JAR
+    runs-on: hiero-citr-linux-medium
+
+    outputs:
+      gcs-uri: ${{ steps.upload.outputs.gcs_uri || '' }}
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        with:
+          egress-policy: audit
+
+      - name: Checkout Code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.ref || github.sha }}
+
+      - name: Set up Java
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: temurin
+          java-version: "21"
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d1993974129d # v4.3.0
+        with:
+          gradle-home-cache-cleanup: true
+
+      - name: Build State Validator Uber shadowJar
+        run: |
+          ./gradlew --no-daemon --stacktrace :hedera-state-validator:shadowJar
+
+      - name: Determine version and artifact
+        id: version-and-artifact
+        run: |
+          set -euo pipefail
+          FULL_VER=$(./gradlew --no-daemon :hedera-state-validator:properties | grep '^version:' | cut -d ' ' -f2)
+          # Remove -SNAPSHOT suffix if present
+          VER_WITHOUT_SNAPSHOT=${FULL_VER%-SNAPSHOT}
+          # Extract major.minor (first two segments)
+          MAJOR_MINOR=$(echo "$VER_WITHOUT_SNAPSHOT" | cut -d '.' -f1-2)
+
+          # Locate the Shadow (uber) JAR built by the module
+          # Shadow defaults to "-all" classifier; pick the most recent matching jar
+          ART_DIR="hedera-state-validator/build/libs"
+          if [[ ! -d "${ART_DIR}" ]]; then
+            echo "Artifact directory not found: ${ART_DIR}" >&2; exit 1
+          fi
+          JAR_PATH="$(ls -1t "${ART_DIR}"/*-all.jar 2>/dev/null | head -n1 || true)"
+          if [[ -z "${JAR_PATH}" ]]; then
+            # fallback to any jar if classifier is customized
+            JAR_PATH="$(ls -1t "${ART_DIR}"/*.jar 2>/dev/null | head -n1 || true)"
+          fi
+          if [[ -z "${JAR_PATH}" ]]; then
+            echo "No jar found in ${ART_DIR}" >&2; exit 1
+          fi
+
+          DEST_NAME="hedera-state-validator-${MAJOR_MINOR}.jar"
+          echo "full_ver=${FULL_VER}" >> "${GITHUB_OUTPUT}"
+          echo "major_minor=${MAJOR_MINOR}" >> "${GITHUB_OUTPUT}"
+          echo "jar_path=${JAR_PATH}" >> "${GITHUB_OUTPUT}"
+          echo "dest_name=${DEST_NAME}" >> "${GITHUB_OUTPUT}"
+
+      - name: Authenticate to Google Cloud
+        id: gcloud-auth
+        uses: step-security/google-github-auth@40f6deebd366f16c782d7a0ad0844e3b96a032a6 # v2.1.10
+        with:
+          workload_identity_provider: "projects/235822363393/locations/global/workloadIdentityPools/hedera-builds-pool/providers/hedera-builds-gh-actions"
+          service_account: "[email protected]"
+          token_format: "access_token"
+          create_credentials_file: true
+
+      - name: Setup Google Cloud SDK
+        id: setup-gcloud
+        uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
+        with:
+          version: "latest"
+          install_components: "gsutil"
+
+      - name: Upload to GCS
+        id: upload
+        env:
+          SRC: ${{ steps.version-and-artifact.outputs.jar_path }}
+          DEST_NAME: ${{ steps.version-and-artifact.outputs.dest_name }}
+          BUCKET_PATH: "gs://hedera-ci-ephemeral-artifacts/hedera/hedera-state-validator"
+        run: |
+          set -euo pipefail
+          echo "Source: ${SRC}"
+          echo "Destination: ${BUCKET_PATH}/${DEST_NAME}"
+          gsutil -m cp "${SRC}" "${BUCKET_PATH}/${DEST_NAME}"
+          echo "gcs_uri=${BUCKET_PATH}/${DEST_NAME}" >> "${GITHUB_OUTPUT}"
+
+      - name: Summary
+        run: |
+          echo "### Published Hedera State Validator Uber JAR" >> "${GITHUB_STEP_SUMMARY}"
+          echo "Version: ${{ steps.version-and-artifact.outputs.full_ver }}" >> "${GITHUB_STEP_SUMMARY}"
+          echo "File: ${{ steps.version-and-artifact.outputs.dest_name }}" >> "${GITHUB_STEP_SUMMARY}"
+          echo "GCS URI: ${{ steps.upload.outputs.gcs_uri }}" >> "${GITHUB_STEP_SUMMARY}"