Skip to content

Commit

Permalink
Sync with develop
Browse files Browse the repository at this point in the history
Signed-off-by: Artem Ananev <[email protected]>
  • Loading branch information
artemananiev committed Dec 21, 2024
2 parents 839d0b4 + 2f5f838 commit 0b599fd
Show file tree
Hide file tree
Showing 645 changed files with 22,509 additions and 15,962 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#########################

/hapi/ @hashgraph/hedera-services @hashgraph/hedera-smart-contracts-core @hashgraph/platform-hashgraph @hashgraph/platform-data @hashgraph/platform-base @hashgraph/platform-architects
/hapi/hedera-protobufs/services @hashgraph/hedera-services @hashgraph/hedera-smart-contracts-core @jsync-swirlds
/hapi/hedera-protobufs/services @hashgraph/hedera-services @hashgraph/hedera-smart-contracts-core @jsync-swirlds @hashgraph/mirror-node


#########################
Expand Down
7 changes: 1 addition & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
version: 2
updates:
- package-ecosystem: "gradle"
directory: "/hedera-dependency-versions"
schedule:
interval: "daily"
open-pull-requests-limit: 10
- package-ecosystem: "gradle"
directory: "/gradle/plugins"
directory: "/hiero-dependency-versions"
schedule:
interval: "daily"
open-pull-requests-limit: 10
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/config/node-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ release:
execution:
time: "20:00:00"
schedule:
- on: "2024-11-22"
name: release/0.57
- on: "2024-12-20"
name: release/0.58
initial-tag:
create: true
name: v0.57.0-alpha.0
name: v0.58.0-alpha.0

8 changes: 4 additions & 4 deletions .github/workflows/node-flow-deploy-release-artifact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ jobs:
- name: Checkout Hedera Protobufs Code
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
token: ${{ secrets.GH_ACCESS_TOKEN }}
token: ${{ secrets.PROTOBUFS_GH_ACCESS_TOKEN }}
fetch-depth: '0'
repository: hashgraph/hedera-protobufs
path: hedera-protobufs
Expand All @@ -220,8 +220,8 @@ jobs:
id: gpg_import
uses: step-security/ghaction-import-gpg@6c8fe4d0126a59d57c21f87c9ae5dd3451fa3cca # v6.1.0
with:
gpg_private_key: ${{ secrets.SVCS_GPG_KEY_CONTENTS }}
passphrase: ${{ secrets.SVCS_GPG_KEY_PASSPHRASE }}
gpg_private_key: ${{ secrets.PROTOBUFS_GPG_KEY_CONTENTS }}
passphrase: ${{ secrets.PROTOBUFS_GPG_KEY_PASSPHRASE }}
git_user_signingkey: true
git_commit_gpgsign: true
git_tag_gpgsign: true
Expand All @@ -231,7 +231,7 @@ jobs:
with:
cwd: 'hedera-protobufs'
author_name: swirlds-eng-automation
author_email: ${{ secrets.SVCS_GIT_USER_EMAIL }}
author_email: ${{ secrets.PROTOBUFS_GPG_USER_EMAIL }}
commit: --signoff
message: "ci: Copied recent protobuf changes from hedera-services"
new_branch: "update-recent-protobuf-changes-${{ github.run_number }}"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/node-zxc-build-release-artifact.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright (C) 2022-2024 Hedera Hashgraph, LLC
# Copyright (C) 2024 Hedera Hashgraph, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -420,7 +420,7 @@ jobs:
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

- name: Setup Docker Buildx Support
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
with:
version: v0.16.2
driver-opts: network=host
Expand Down Expand Up @@ -575,7 +575,7 @@ jobs:
service_account: "[email protected]"

- name: Setup JFrog CLI
uses: jfrog/setup-jfrog-cli@96153976e4e81b3701e9cc0a5b9597e80614af81 # v4.5.1
uses: jfrog/setup-jfrog-cli@dff217c085c17666e8849ebdbf29c8fe5e3995e6 # v4.5.2
env:
JF_URL: ${{ secrets.jf-url }}
JF_ACCESS_TOKEN: ${{ secrets.jf-access-token }}
Expand Down Expand Up @@ -658,7 +658,7 @@ jobs:
fi
- name: Upload Manifests
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ (steps.gcp.outcome == 'success' || steps.jfrog.outcome == 'success') && !cancelled() && always() }}
with:
name: Production Image Manifests
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/node-zxc-compile-application-code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ jobs:
comment_mode: errors # only comment if we could not find or parse the JUnit XML files

- name: Upload Unit Test Report Artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-unit-tests && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
name: Unit Test Report
Expand All @@ -241,7 +241,7 @@ jobs:
comment_mode: errors # only comment if we could not find or parse the JUnit XML files

- name: Upload Unit Test (Timing Sensitive) Report Artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-timing-sensitive-tests && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
name: Unit Test Report (Timing Sensitive)
Expand All @@ -263,7 +263,7 @@ jobs:
comment_mode: errors # only comment if we could not find or parse the JUnit XML files

- name: Upload Unit Test (Time Consuming) Report Artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-time-consuming-tests && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
name: Unit Test Report (Time Consuming)
Expand All @@ -285,7 +285,7 @@ jobs:
comment_mode: errors # only comment if we could not find or parse the JUnit XML files

- name: Upload Hammer Test Report Artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hammer-tests && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
name: Hammer Test Report
Expand All @@ -311,15 +311,15 @@ jobs:
comment_mode: errors # only comment if we could not find or parse the JUnit XML files

- name: Upload HAPI Test (Misc) Report Artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-misc && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
name: HAPI Test (Misc) Reports
path: "**/test-clients/build/test-results/**/TEST-*.xml"
retention-days: 7

- name: Upload HAPI Test (Misc) Network Logs
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-misc && inputs.enable-network-log-capture && steps.gradle-hapi-misc.conclusion == 'failure' && !cancelled() }}
with:
name: HAPI Test (Misc) Network Logs
Expand All @@ -345,15 +345,15 @@ jobs:
comment_mode: errors # only comment if we could not find or parse the JUnit XML files

- name: Upload HAPI Test (Crypto) Report Artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-crypto && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
name: HAPI Test (Crypto) Report
path: "**/test-clients/build/test-results/testSubprocess/TEST-*.xml"
retention-days: 7

- name: Upload HAPI Test (crypto) Network Logs
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-crypto && inputs.enable-network-log-capture && steps.gradle-hapi-crypto.conclusion == 'failure' && !cancelled() }}
with:
name: HAPI Test (Crypto) Network Logs
Expand All @@ -379,15 +379,15 @@ jobs:
comment_mode: errors # only comment if we could not find or parse the JUnit XML files

- name: Upload HAPI Test (Token) Report Artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-token && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
name: HAPI Test (Token) Report
path: "**/test-clients/build/test-results/testSubprocess/TEST-*.xml"
retention-days: 7

- name: Upload HAPI Test (Token) Network Logs
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-token && inputs.enable-network-log-capture && steps.gradle-hapi-token.conclusion == 'failure' && !cancelled() }}
with:
name: HAPI Test (Token) Network Logs
Expand All @@ -413,15 +413,15 @@ jobs:
comment_mode: errors # only comment if we could not find or parse the JUnit XML files

- name: Upload HAPI Test (Smart Contract) Report Artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-smart-contract && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
name: HAPI Test (Smart Contract) Report
path: "**/test-clients/build/test-results/testSubprocess/TEST-*.xml"
retention-days: 7

- name: Upload HAPI Test (Smart Contract) Network Logs
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-smart-contract && inputs.enable-network-log-capture && steps.gradle-hapi-smart-contract.conclusion == 'failure' && !cancelled() }}
with:
name: HAPI Test (Smart Contract) Network Logs
Expand All @@ -447,15 +447,15 @@ jobs:
comment_mode: errors # only comment if we could not find or parse the JUnit XML files

- name: Upload HAPI Test (Time Consuming) Report Artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-time-consuming && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
name: HAPI Test (Time Consuming) Report
path: "**/test-clients/build/test-results/testSubprocess/TEST-*.xml"
retention-days: 7

- name: Upload HAPI Test (Time Consuming) Network Logs
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-time-consuming && inputs.enable-network-log-capture && steps.gradle-hapi-time-consuming.conclusion == 'failure' && !cancelled() }}
with:
name: HAPI Test (Time Consuming) Network Logs
Expand All @@ -481,15 +481,15 @@ jobs:
comment_mode: errors # only comment if we could not find or parse the JUnit XML files

- name: Upload HAPI Test (Restart) Report Artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-restart && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
name: HAPI Test (Restart) Report
path: "**/test-clients/build/test-results/testSubprocess/TEST-*.xml"
retention-days: 7

- name: Upload HAPI Test (Restart) Network Logs
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-restart && inputs.enable-network-log-capture && steps.gradle-hapi-restart.conclusion == 'failure' && !cancelled() }}
with:
name: HAPI Test (Restart) Network Logs
Expand All @@ -516,15 +516,15 @@ jobs:
comment_mode: errors # only comment if we could not find or parse the JUnit XML files

- name: Upload HAPI Test (Node Death Reconnect) Report Artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-nd-reconnect && steps.gradle-build.conclusion == 'failure' && !cancelled() }}
with:
name: HAPI Test (Node Death Reconnect) Report
path: "**/test-clients/build/test-results/testSubprocess/TEST-*.xml"
retention-days: 7

- name: Upload HAPI Test (Node Death Reconnect) Network Logs
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-hapi-tests-nd-reconnect && inputs.enable-network-log-capture && steps.gradle-hapi-nd-reconnect.conclusion == 'failure' && !cancelled() }}
with:
name: HAPI Test (Node Death Reconnect) Network Logs
Expand All @@ -547,7 +547,7 @@ jobs:
run: bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l Java -r gradle/aggregation/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml

- name: Upload Test Reports
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ inputs.enable-unit-tests && !cancelled() }}
with:
name: Test Reports
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/node-zxcron-release-fsts-regression.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
major="${BASH_REMATCH[1]}"
minor="${BASH_REMATCH[2]}"
if [[ "${major}" -eq 0 && "${minor}" -lt 55 ]]; then
if [[ "${major}" -eq 0 && "${minor}" -lt 57 ]]; then
continue
fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
major="${BASH_REMATCH[1]}"
minor="${BASH_REMATCH[2]}"
if [[ "${major}" -eq 0 && "${minor}" -lt 55 ]]; then
if [[ "${major}" -eq 0 && "${minor}" -lt 57 ]]; then
continue
fi
Expand Down
21 changes: 3 additions & 18 deletions .github/workflows/zxc-publish-production-image.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
##
# Copyright (C) 2024 Hedera Hashgraph, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
##

# SPDX-License-Identifier: Apache-2.0
name: "ZXC: Publish Production Image"
on:
workflow_call:
Expand Down Expand Up @@ -112,7 +97,7 @@ jobs:
service_account: "[email protected]"

- name: Setup JFrog CLI
uses: jfrog/setup-jfrog-cli@96153976e4e81b3701e9cc0a5b9597e80614af81 # v4.5.1
uses: jfrog/setup-jfrog-cli@dff217c085c17666e8849ebdbf29c8fe5e3995e6 # v4.5.2
if: ${{ inputs.dry-run-enabled != true && inputs.registry-name == 'jfrog' && !cancelled() && !failure() }}
env:
JF_URL: ${{ secrets.jf-url }}
Expand Down Expand Up @@ -155,7 +140,7 @@ jobs:
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

- name: Setup Docker Buildx Support
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
with:
version: v0.16.2
driver-opts: network=host
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/zxc-verify-docker-build-determinism.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ jobs:
if: ${{ steps.baseline.outputs.exists == 'false' && !failure() && !cancelled() }}

- name: Setup Docker Buildx Support
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
if: ${{ steps.baseline.outputs.exists == 'false' && !failure() && !cancelled() }}
with:
version: v0.16.2
Expand Down Expand Up @@ -426,7 +426,7 @@ jobs:
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

- name: Setup Docker Buildx Support
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
with:
version: v0.16.2
driver-opts: network=host
Expand Down Expand Up @@ -499,7 +499,7 @@ jobs:
fi
- name: Publish Manifests
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ steps.regen-manifest.conclusion == 'success' && failure() && !cancelled() }}
with:
name: Docker Manifests [${{ join(matrix.os, ', ') }}]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zxc-verify-gradle-build-determinism.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ jobs:
fi
- name: Publish Manifests
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
if: ${{ steps.regen-manifest.conclusion == 'success' && failure() && !cancelled() }}
with:
name: Gradle Manifests [${{ join(matrix.os, ', ') }}]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zxcron-extended-test-suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ jobs:
done
- name: Upload log as artifact
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
with:
path: run.log

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zxf-collect-workflow-logs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:

- name: Upload log as artifact
id: upload-log
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
with:
path: workflow-run.log

Expand Down
Loading

0 comments on commit 0b599fd

Please sign in to comment.