fix: Cherry-pick: Remove tss encryption key from node-related protos (#…

…16514) Signed-off-by: Matt Hess <[email protected]>
hashgraph · Nov 8, 2024 · 1ece16a · 1ece16a
1 parent a21a5be
commit 1ece16a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 94 deletions.
diff --git a/hapi/hedera-protobufs/services/node_create.proto b/hapi/hedera-protobufs/services/node_create.proto
@@ -137,27 +137,4 @@ message NodeCreateTransactionBody {
      * This field is REQUIRED and MUST NOT be set to an empty `KeyList`.
      */
     proto.Key admin_key = 7;
-
-    /**
-     * An ALT_BN128 elliptic curve public encryption key.<br/>
-     * This is controlled by the node operator and specific to this
-     * node's TSS operations.
-     * <p>
-     * The elliptic curve type MAY change in the future. For example,
-     * if the Ethereum ecosystem creates precompiles for BLS12_381,
-     * we may switch to that curve.<br/>
-     * This value SHALL be specified according to EIP-196 and EIP-197 standards.
-     * See [EIP-196](https://eips.ethereum.org/EIPS/eip-196#encoding) and
-     * (EIP-197](https://eips.ethereum.org/EIPS/eip-197#encoding)<br/>
-     * This field is OPTIONAL (that is, it can initially be null),
-     * but once set, it MUST NOT be null.<br/>
-     * If this field is set:
-     * <ul>
-     *   <li>This field MUST contain the bytes of a standard ALT_BN128 key value.</li>
-     *   <li>This key MUST only be used for node TSS operations.</li>
-     *   <li>This key MUST be unique in all future rosters.</li>
-     *   <li>This key MUST be used to encrypt all of this node's future TSS messages.</li>
-     * </ul>
-     */
-    bytes tss_encryption_key = 8;
 }
diff --git a/hapi/hedera-protobufs/services/node_update.proto b/hapi/hedera-protobufs/services/node_update.proto
@@ -161,27 +161,4 @@ message NodeUpdateTransactionBody {
      * If set, this field MUST NOT be set to an empty `KeyList`.
      */
     proto.Key admin_key = 8;
-
-    /**
-     * An ALT_BN128 elliptic curve public encryption key.<br/>
-     * This is controlled by the node operator and specific to this
-     * node's TSS operations.
-     * <p>
-     * The elliptic curve type MAY change in the future. For example,
-     * if the Ethereum ecosystem creates precompiles for BLS12_381,
-     * we may switch to that curve.<br/>
-     * This value SHALL be specified according to EIP-196 and EIP-197 standards.
-     * See [EIP-196](https://eips.ethereum.org/EIPS/eip-196#encoding) and
-     * (EIP-197](https://eips.ethereum.org/EIPS/eip-197#encoding)<br/>
-     * This field is OPTIONAL (that is, it can initially be null),
-     * but once set, it MUST NOT be null.<br/>
-     * If this field is set:
-     * <ul>
-     *   <li>This field MUST contain the bytes of a standard ALT_BN128 key value.</li>
-     *   <li>This key MUST only be used for node TSS operations.</li>
-     *   <li>This key MUST be unique in all future rosters.</li>
-     *   <li>This key MUST be used to encrypt all of this node's future TSS messages.</li>
-     * </ul>
-     */
-    bytes tss_encryption_key = 9;
 }
diff --git a/hapi/hedera-protobufs/services/state/addressbook/node.proto b/hapi/hedera-protobufs/services/state/addressbook/node.proto
@@ -146,27 +146,4 @@ message Node {
      * This field is REQUIRED and MUST NOT be set to an empty `KeyList`.
      */
     proto.Key admin_key = 10;
-
-    /**
-     * An ALT_BN128 elliptic curve public encryption key.<br/>
-     * This is controlled by the node operator and specific to this
-     * node's TSS operations.
-     * <p>
-     * The elliptic curve type MAY change in the future. For example,
-     * if the Ethereum ecosystem creates precompiles for BLS12_381,
-     * we may switch to that curve.<br/>
-     * This value SHALL be specified according to EIP-196 and EIP-197 standards.
-     * See [EIP-196](https://eips.ethereum.org/EIPS/eip-196#encoding) and
-     * (EIP-197](https://eips.ethereum.org/EIPS/eip-197#encoding)<br/>
-     * This field is OPTIONAL (that is, it can initially be null),
-     * but once set, it MUST NOT be null.<br/>
-     * If this field is set:
-     * <ul>
-     *   <li>This field MUST contain the bytes of a standard ALT_BN128 key value.</li>
-     *   <li>This key MUST only be used for node TSS operations.</li>
-     *   <li>This key MUST be unique in all future rosters.</li>
-     *   <li>This key MUST be used to encrypt all of this node's future TSS messages.</li>
-     * </ul>
-     */
-    bytes tss_encryption_key = 11;
 }
diff --git a/...mpl/src/main/java/com/hedera/node/app/service/addressbook/impl/ReadableNodeStoreImpl.java b/...mpl/src/main/java/com/hedera/node/app/service/addressbook/impl/ReadableNodeStoreImpl.java
@@ -98,7 +98,8 @@ private Roster constructFromNodesState(@NonNull final ReadableKVState<EntityNumb
                         .weight(nodeDetail.weight())
                         .gossipCaCertificate(nodeDetail.gossipCaCertificate())
                         .gossipEndpoint(nodeDetail.gossipEndpoint())
-                        .tssEncryptionKey(nodeDetail.tssEncryptionKey())
+                        // (TSS-FUTURE) Enable node's TSS encryption key
+                        // .tssEncryptionKey(nodeDetail.tssEncryptionKey())
                         .build();
                 rosterEntries.add(entry);
             }

diff --git a/.../java/com/hedera/node/app/service/addressbook/impl/test/handlers/AddressBookTestBase.java b/.../java/com/hedera/node/app/service/addressbook/impl/test/handlers/AddressBookTestBase.java
@@ -142,8 +142,6 @@ public class AddressBookTestBase {
     private final byte[] invalidIPBytes = {49, 46, 48, 46, 48, 46, 48};
     protected final ServiceEndpoint endpoint10 = new ServiceEndpoint(Bytes.wrap(invalidIPBytes), 1234, null);
 
-    private static final Bytes TSS_KEY = Bytes.wrap(new byte[] {1, 2, 3});
-
     protected Node node;
 
     @Mock
@@ -248,8 +246,7 @@ protected void givenValidNode(boolean deleted) {
                 Bytes.wrap(grpcCertificateHash),
                 0,
                 deleted,
-                key,
-                TSS_KEY);
+                key);
     }
 
     protected void givenValidNodeWithAdminKey(Key adminKey) {
@@ -263,8 +260,7 @@ protected void givenValidNodeWithAdminKey(Key adminKey) {
                 Bytes.wrap(grpcCertificateHash),
                 0,
                 false,
-                adminKey,
-                TSS_KEY);
+                adminKey);
     }
 
     protected Node createNode() {
@@ -278,7 +274,6 @@ protected Node createNode() {
                 .grpcCertificateHash(Bytes.wrap(grpcCertificateHash))
                 .weight(0)
                 .adminKey(key)
-                .tssEncryptionKey(TSS_KEY)
                 .build();
     }
 

diff --git a/...ra/node/app/service/networkadmin/impl/test/handlers/ReadableFreezeUpgradeActionsTest.java b/...ra/node/app/service/networkadmin/impl/test/handlers/ReadableFreezeUpgradeActionsTest.java
@@ -116,7 +116,6 @@ class ReadableFreezeUpgradeActionsTest {
                                     KEY_BUILDER.apply(B_NAME).build(),
                                     A_THRESHOLD_KEY)))
             .build();
-    private static final Bytes TSS_KEY = Bytes.wrap(new byte[] {1, 2, 3});
 
     private Path noiseFileLoc;
     private Path noiseSubFileLoc;
@@ -429,8 +428,7 @@ private void setupNodes() throws CertificateException, IOException {
                 Bytes.wrap("grpc1CertificateHash"),
                 2,
                 false,
-                A_COMPLEX_KEY,
-                TSS_KEY);
+                A_COMPLEX_KEY);
         final var node2 = new Node(
                 2,
                 asAccount(4),
@@ -443,8 +441,7 @@ private void setupNodes() throws CertificateException, IOException {
                 Bytes.wrap("grpc2CertificateHash"),
                 4,
                 false,
-                A_COMPLEX_KEY,
-                TSS_KEY);
+                A_COMPLEX_KEY);
         final var node3 = new Node(
                 3,
                 asAccount(6),
@@ -457,8 +454,7 @@ private void setupNodes() throws CertificateException, IOException {
                 Bytes.wrap("grpc3CertificateHash"),
                 1,
                 true,
-                A_COMPLEX_KEY,
-                TSS_KEY);
+                A_COMPLEX_KEY);
         final var node4 = new Node(
                 4,
                 asAccount(8),
@@ -472,8 +468,7 @@ private void setupNodes() throws CertificateException, IOException {
                 Bytes.wrap("grpc5CertificateHash"),
                 8,
                 false,
-                A_COMPLEX_KEY,
-                TSS_KEY);
+                A_COMPLEX_KEY);
         final var readableNodeState = MapReadableKVState.<EntityNumber, Node>builder(NODES_KEY)
                 .value(new EntityNumber(4), node4)
                 .value(new EntityNumber(2), node2)
@@ -557,8 +552,7 @@ private void setupNodes2() throws CertificateException, IOException {
                 Bytes.wrap("grpc1CertificateHash"),
                 2,
                 false,
-                A_COMPLEX_KEY,
-                TSS_KEY);
+                A_COMPLEX_KEY);
         final var node2 = new Node(
                 1,
                 asAccount(4),
@@ -571,8 +565,7 @@ private void setupNodes2() throws CertificateException, IOException {
                 Bytes.wrap("grpc2CertificateHash"),
                 4,
                 false,
-                A_COMPLEX_KEY,
-                TSS_KEY);
+                A_COMPLEX_KEY);
         final var node3 = new Node(
                 2,
                 asAccount(6),
@@ -585,8 +578,7 @@ private void setupNodes2() throws CertificateException, IOException {
                 Bytes.wrap("grpc3CertificateHash"),
                 1,
                 false,
-                A_COMPLEX_KEY,
-                TSS_KEY);
+                A_COMPLEX_KEY);
         final var node4 = new Node(
                 3,
                 asAccount(8),
@@ -600,8 +592,7 @@ private void setupNodes2() throws CertificateException, IOException {
                 Bytes.wrap("grpc5CertificateHash"),
                 8,
                 true,
-                A_COMPLEX_KEY,
-                TSS_KEY);
+                A_COMPLEX_KEY);
         final var readableNodeState = MapReadableKVState.<EntityNumber, Node>builder(NODES_KEY)
                 .value(new EntityNumber(3), node4)
                 .value(new EntityNumber(1), node2)