Merge branch 'develop' into 14255-reusable-gradle-config

Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
hashgraph · Dec 17, 2024 · 1aac63f · 1aac63f
2 parents 40e196a + 753d1be
commit 1aac63f
Show file tree

Hide file tree

Showing 165 changed files with 4,590 additions and 2,462 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -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
 
 
 #########################

diff --git a/.github/workflows/config/node-release.yaml b/.github/workflows/config/node-release.yaml
@@ -1,11 +1,11 @@
 release:
   branching:
     execution:
-      time: "20:00:00"
+      time: "18:00:00"
     schedule:
-      - on: "2024-11-22"
-        name: release/0.57
+      - on: "2024-12-13"
+        name: release/0.58
         initial-tag:
           create: true
-          name: v0.57.0-alpha.0
+          name: v0.58.0-alpha.0
 
diff --git a/.github/workflows/node-flow-deploy-release-artifact.yaml b/.github/workflows/node-flow-deploy-release-artifact.yaml
@@ -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
@@ -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
@@ -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 }}"

diff --git a/.github/workflows/node-zxc-build-release-artifact.yaml b/.github/workflows/node-zxc-build-release-artifact.yaml
@@ -405,7 +405,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
@@ -560,7 +560,7 @@ jobs:
           service_account: "swirlds-automation@hedera-registry.iam.gserviceaccount.com"
 
       - 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 }}

diff --git a/.github/workflows/node-zxcron-release-fsts-regression.yaml b/.github/workflows/node-zxcron-release-fsts-regression.yaml
@@ -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
 

diff --git a/.github/workflows/platform-zxcron-release-jrs-regression.yaml b/.github/workflows/platform-zxcron-release-jrs-regression.yaml
@@ -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
 

diff --git a/.github/workflows/zxc-publish-production-image.yaml b/.github/workflows/zxc-publish-production-image.yaml
@@ -97,7 +97,7 @@ jobs:
           service_account: "swirlds-automation@hedera-registry.iam.gserviceaccount.com"
 
       - 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 }}
@@ -140,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

diff --git a/.github/workflows/zxc-verify-docker-build-determinism.yaml b/.github/workflows/zxc-verify-docker-build-determinism.yaml
@@ -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
@@ -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

diff --git a/hapi/hedera-protobufs/block/stream/output/state_changes.proto b/hapi/hedera-protobufs/block/stream/output/state_changes.proto
@@ -64,12 +64,11 @@ import "state/token/token.proto";
 import "state/token/token_relation.proto";
 import "state/platform_state.proto";
 import "timestamp.proto";
-import "auxiliary/tss/tss_encryption_key.proto";
 import "auxiliary/tss/tss_message.proto";
 import "auxiliary/tss/tss_vote.proto";
+import "state/tss/tss_encryption_keys.proto";
 import "state/tss/tss_message_map_key.proto";
 import "state/tss/tss_vote_map_key.proto";
-import "state/tss/tss_status.proto";
 
 /**
  * A set of state changes.
@@ -609,11 +608,6 @@ message SingletonUpdateChange {
          * A change to the roster state singleton.
          */
         com.hedera.hapi.node.state.roster.RosterState roster_state_value = 13;
-
-        /**
-         * A change to the tss status state singleton.
-         */
-        com.hedera.hapi.node.state.tss.TssStatus tss_status_state_value = 14;
     }
 }
 
@@ -892,7 +886,7 @@ message MapChangeValue {
         /**
          * The value of a map that stores tss encryption keys for each node.
          */
-        com.hedera.hapi.services.auxiliary.tss.TssEncryptionKeyTransactionBody tss_encryption_key_value = 20;
+        com.hedera.hapi.node.state.tss.TssEncryptionKeys tss_encryption_keys_value = 20;
 
         /**
          * The value of a map that stores tss messages submitted for each share of nodes.

diff --git a/hapi/hedera-protobufs/services/state/tss/tss_encryption_keys.proto b/hapi/hedera-protobufs/services/state/tss/tss_encryption_keys.proto
@@ -0,0 +1,51 @@
+/**
+ * # Current and next TSS encryption keys
+ *
+ * ### Keywords
+ * The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+ * "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+ * document are to be interpreted as described in
+ * [RFC2119](https://www.ietf.org/rfc/rfc2119) and clarified in
+ * [RFC8174](https://www.ietf.org/rfc/rfc8174).
+ */
+syntax = "proto3";
+
+package com.hedera.hapi.node.state.tss;
+
+/*
+ * 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.
+ */
+
+option java_package = "com.hedera.hapi.node.state.tss.legacy";
+// <<<pbj.java_package = "com.hedera.hapi.node.state.tss">>> This comment is special code for setting PBJ Compiler java package
+option java_multiple_files = true;
+
+/**
+ * A message containing a node's current and next TSS encryption keys, where
+ * the next key (if present) will be switched to the node's current key during
+ * the first transaction at the beginning of a staking period.<br/>
+ */
+message TssEncryptionKeys {
+
+  /**
+   * If non-empty, a node's current TSS encryption key.
+   */
+  bytes current_encryption_key = 1;
+
+  /**
+   * If non-empty, the same node's next TSS encryption key.
+   */
+  bytes next_encryption_key = 2;
+}
diff --git a/hapi/hedera-protobufs/services/state/tss/tss_status.proto b/hapi/hedera-protobufs/services/state/tss/tss_status.proto
diff --git a/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java b/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java
@@ -35,14 +35,12 @@
 import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 /**
  * Utility class for working with the HAPI. We might move this to the HAPI project.
  */
 public class HapiUtils {
     private static final int EVM_ADDRESS_ALIAS_LENGTH = 20;
-    public static final Pattern ALPHA_PRE_PATTERN = Pattern.compile("alpha[.](\\d+)");
     public static final Key EMPTY_KEY_LIST =
             Key.newBuilder().keyList(KeyList.DEFAULT).build();
     public static final long FUNDING_ACCOUNT_EXPIRY = 33197904000L;