Merge branch 'refs/heads/main' into hip-991-topic-fees

hashgraph · Jan 10, 2025 · 397d254 · 397d254
2 parents f28d01d + be1981d
commit 397d254
Show file tree

Hide file tree

Showing 292 changed files with 4,974 additions and 10,944 deletions.
diff --git a/.github/workflows/node-zxc-build-release-artifact.yaml b/.github/workflows/node-zxc-build-release-artifact.yaml
@@ -1,5 +1,5 @@
 ##
-# Copyright (C) 2024 Hedera Hashgraph, LLC
+# Copyright (C) 2024-2025 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.
@@ -453,23 +453,23 @@ jobs:
           cp -rvf ~/artifact-build/* hedera-node/infrastructure/docker/containers/local-node/main-network-node/sdk/
 
       - name: Build Haveged Image
-        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
+        uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
         with:
           push: true
           platforms: linux/amd64,linux/arm64
           context: hedera-node/infrastructure/docker/containers/local-node/network-node-haveged
           tags: ${{ steps.set-registry.outputs.docker-tag-base }}/network-node-haveged:${{ needs.validate.outputs.version }}
 
       - name: Build Base Image
-        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
+        uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
         with:
           push: true
           platforms: linux/amd64,linux/arm64
           context: hedera-node/infrastructure/docker/containers/local-node/network-node-base
           tags: ${{ steps.set-registry.outputs.docker-tag-base }}/network-node-base:${{ needs.validate.outputs.version }}
 
       - name: Build Network Node Image
-        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
+        uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
         with:
           push: true
           platforms: linux/amd64,linux/arm64
@@ -575,7 +575,7 @@ jobs:
           service_account: "[email protected]"
 
       - name: Setup JFrog CLI
-        uses: jfrog/setup-jfrog-cli@f0a84f35b0e0bd21838c5fb3e6788072d6540d13 # v4.5.5
+        uses: jfrog/setup-jfrog-cli@f748a0599171a192a2668afee8d0497f7c1069df # v4.5.6
         env:
           JF_URL: ${{ secrets.jf-url }}
           JF_ACCESS_TOKEN: ${{ secrets.jf-access-token }}

diff --git a/.github/workflows/zxc-publish-production-image.yaml b/.github/workflows/zxc-publish-production-image.yaml
@@ -1,5 +1,5 @@
 ##
-# Copyright (C) 2024 Hedera Hashgraph, LLC
+# Copyright (C) 2024-2025 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.
@@ -112,7 +112,7 @@ jobs:
           service_account: "[email protected]"
 
       - name: Setup JFrog CLI
-        uses: jfrog/setup-jfrog-cli@f0a84f35b0e0bd21838c5fb3e6788072d6540d13 # v4.5.5
+        uses: jfrog/setup-jfrog-cli@f748a0599171a192a2668afee8d0497f7c1069df # v4.5.6
         if: ${{ inputs.dry-run-enabled != true && inputs.registry-name == 'jfrog' && !cancelled() && !failure() }}
         env:
           JF_URL: ${{ secrets.jf-url }}
@@ -189,7 +189,7 @@ jobs:
           cp -rvf ~/artifact-build/* hedera-node/infrastructure/docker/containers/production-next/consensus-node/sdk/
 
       - name: Build Consensus Node Image
-        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
+        uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
         env:
           SOURCE_DATE_EPOCH: ${{ steps.commit.outputs.source-date }}
         with:

diff --git a/.github/workflows/zxc-verify-docker-build-determinism.yaml b/.github/workflows/zxc-verify-docker-build-determinism.yaml
@@ -1,5 +1,5 @@
 ##
-# Copyright (C) 2023-2024 Hedera Hashgraph, LLC
+# Copyright (C) 2023-2025 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.
@@ -240,7 +240,7 @@ jobs:
           printf "VERSION=%s\nCOMMIT=%s\nDATE=%s" "$(./gradlew -q showVersion)" "$(git log -1 --format='%H' | cut -c1-8)" "$(date -u)" | tee "${{ github.workspace }}/${{ env.DOCKER_CONTEXT_PATH }}/sdk/VERSION"
 
       - name: Build Docker Image
-        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
+        uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
         env:
           SOURCE_DATE_EPOCH: ${{ steps.commit.outputs.source-date }}
         if: ${{ steps.baseline.outputs.exists == 'false' && !failure() && !cancelled() }}
@@ -444,7 +444,7 @@ jobs:
         run: docker info
 
       - name: Build Docker Image
-        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
+        uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
         env:
           SOURCE_DATE_EPOCH: ${{ needs.generate-baseline.outputs.source-date }}
         with:

diff --git a/gradle/aggregation/build.gradle.kts b/gradle/aggregation/build.gradle.kts
@@ -1,4 +1,19 @@
-// SPDX-License-Identifier: Apache-2.0
+/*
+ * Copyright (C) 2024-2025 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.
+ */
+
 plugins {
     id("org.hiero.gradle.base.lifecycle")
     id("org.hiero.gradle.report.code-coverage")
@@ -8,6 +23,7 @@ plugins {
 
 dependencies {
     implementation(project(":app"))
+    // examples that also contain tests we would like to run
     implementation(project(":swirlds-platform-base-example"))
     implementation(project(":AddressBookTestingTool"))
     implementation(project(":ConsistencyTestingTool"))
@@ -16,7 +32,9 @@ dependencies {
     implementation(project(":PlatformTestingTool"))
     implementation(project(":StatsSigningTestingTool"))
     implementation(project(":StressTestingTool"))
+    // projects that only contains tests (and no production code)
     implementation(project(":test-clients"))
+    implementation(project(":swirlds-platform-test"))
 }
 
 tasks.testCodeCoverageReport {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/hapi/hedera-protobufs/services/auxiliary/tss/tss_share_signature.proto b/hapi/hedera-protobufs/services/auxiliary/tss/tss_share_signature.proto
diff --git a/hapi/hedera-protobufs/services/basic_types.proto b/hapi/hedera-protobufs/services/basic_types.proto
@@ -1193,6 +1193,10 @@ message SignatureMap {
  * The transactions and queries supported by Hedera Hashgraph.
  */
 enum HederaFunctionality {
+    // FUTURE - Uncomment when https://github.com/hashgraph/pbj/issues/339 is fixed;
+    // currently the PBJ-generated unit tests fail when using reserved ordinals
+    // reserved 96, 97, 98, 99;
+
     /**
      * Unused - The first value is unused because this default value is
      * ambiguous with an "unset" value and therefore should not be used.
@@ -1644,26 +1648,6 @@ enum HederaFunctionality {
      */
     TokenClaimAirdrop = 95;
 
-    /**
-     * A message produced as part of Threshold Signature Scheme (TSS) processing.
-     */
-    TssMessage = 96;
-
-    /**
-     * Submit a vote as part of the Threshold Signature Scheme (TSS) processing.
-     */
-    TssVote = 97;
-
-    /**
-     * Submit a node signature as part of the Threshold Signature Scheme (TSS) processing.
-     */
-    TssShareSignature = 98;
-
-    /**
-     * Submit a node public tss encryption key as part of the Threshold Signature Scheme (TSS).
-     */
-    TssEncryptionKey = 99;
-
     /**
      * Submit a signature of a state root hash gossiped to other nodes
      */

diff --git a/hapi/hedera-protobufs/services/transaction_body.proto b/hapi/hedera-protobufs/services/transaction_body.proto
@@ -103,11 +103,6 @@ import "node_create.proto";
 import "node_update.proto";
 import "node_delete.proto";
 
-import "auxiliary/tss/tss_message.proto";
-import "auxiliary/tss/tss_vote.proto";
-import "auxiliary/tss/tss_share_signature.proto";
-import "auxiliary/tss/tss_encryption_key.proto";
-
 import "event/state_signature_transaction.proto";
 
 /**
@@ -124,7 +119,9 @@ import "event/state_signature_transaction.proto";
  * various parameters required to process a transaction.
  */
 message TransactionBody {
-    reserved 30; // removed prior to earliest available history.
+    reserved 30, 61, 62, 63, 64;
+
+    reserved "tssMessage", "tssVote", "tssShareSignature", "tssEncryptionKey";
 
     /**
      * A transaction identifier.<br/>
@@ -559,26 +556,6 @@ message TransactionBody {
          */
         TokenClaimAirdropTransactionBody tokenClaimAirdrop = 60;
 
-        /**
-         * A transaction body for a `tssMessage` request.
-         */
-        com.hedera.hapi.services.auxiliary.tss.TssMessageTransactionBody tssMessage = 61;
-
-        /**
-         * A transaction body for a `tssVote` request.
-         */
-        com.hedera.hapi.services.auxiliary.tss.TssVoteTransactionBody tssVote = 62;
-
-        /**
-         * A transaction body for node signature as part of the Threshold Signature Scheme (TSS) processing.
-         */
-        com.hedera.hapi.services.auxiliary.tss.TssShareSignatureTransactionBody tssShareSignature = 63;
-
-        /**
-         * A transaction body for a 'tssEncryptionKey` request
-         */
-        com.hedera.hapi.services.auxiliary.tss.TssEncryptionKeyTransactionBody tssEncryptionKey = 64;
-
         /**
          * A transaction body for signature of a state root hash gossiped to other nodes
          */

diff --git a/hapi/internal-protobufs/network/network.proto b/hapi/internal-protobufs/network/network.proto
@@ -35,7 +35,6 @@ package com.hedera.node.internal.network;
  * limitations under the License.
  */
 
-import "auxiliary/tss/tss_message.proto";
 import "state/addressbook/node.proto";
 import "state/roster/roster.proto";
 
@@ -65,32 +64,16 @@ option java_multiple_files = true;
   * resets.
  */
 message Network {
+  reserved 2;
+
   /**
    * The metadata of the nodes in the network.
    */
   repeated NodeMetadata node_metadata = 1;
 
   /**
-   * A list of TSS messages that have been generated by the nodes in
-   * a target network that is receiving a "transplant state". <br/>
-   * This gives the capability to preserve the ledger id of the target network
-   * even if the transplant state has no keys or roster entries in common with
-   * the target.
-   * <p>
-   * This MUST be exactly the ordered list of TSS messages used to generate
-   * the target network's ledger id; and must generate the same ledger id
-   * given below.
-   */
-  repeated com.hedera.hapi.services.auxiliary.tss.TssMessageTransactionBody tss_messages = 2;
-
-  /**
-  * A public key.<br/>
-  * This key both identifies the ledger and can be used to verify ledger
-  * signatures on a block root hash.
-  * <p>
-  * This value MUST be set.<br/>
-  * This value MUST NOT be empty.<br/>
-  * This value MUST contain a valid public key.
+  * If set, the hash of the first roster that adopted TSS.<br/>
+  * A public input to every hinTS verification key proof.
   */
   bytes ledger_id = 3;
 }
@@ -99,6 +82,8 @@ message Network {
  * The full information needed for a single node in the network state.
  */
 message NodeMetadata {
+  reserved 3;
+
   /**
    * The node's entry in the current roster at the time of the network snapshot;
    * required to validate the network's ledger id if set.
@@ -114,12 +99,4 @@ message NodeMetadata {
   * in the network state.<br/>
   */
   com.hedera.hapi.node.state.addressbook.Node node = 2;
-
-  /**
-    * An elliptic curve public encryption key.<br/>
-    * If set, the public part of a prescribed TSS encryption key for the node.
-    * This is currently a BN254 elliptic curve, but this type may be subject to
-    * change in the future.
-    */
-  bytes tss_encryption_key = 3;
 }