Merge remote-tracking branch 'refs/remotes/upstream/main' into hip-90…

…4-register-airdrop-proto # Conflicts: # services/basic_types.proto # services/response_code.proto # services/schedulable_transaction_body.proto # services/token_service.proto # services/transaction_body.proto
hashgraph · Jun 28, 2024 · 91b855c · 91b855c
2 parents 5b1dbee + 0df9df1
commit 91b855c
Show file tree

Hide file tree

Showing 12 changed files with 154 additions and 317 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,5 +1,28 @@
-* @hashgraph/hedera-services @hashgraph/mirror-node
-/platform/ @hashgraph/platform-hashgraph
-/.github/ @hashgraph/release-engineering
-.gitignore @hashgraph/release-engineering
-LICENSE @hashgraph/release-engineering
+*                                               @hashgraph/hedera-services @hashgraph/mirror-node
+/platform/                                      @hashgraph/platform-hashgraph
+/mirror/                                        @hashgraph/mirror-node
+
+
+#########################
+#####  Core Files  ######
+#########################
+
+# NOTE: Must be placed last to ensure enforcement over all other rules
+
+# Protection Rules for Github Configuration Files and Actions Workflows
+/.github/                                       @hashgraph/release-engineering-managers @hashgraph/devops-ci
+/.github/workflows/                             @hashgraph/devops-ci
+
+# Self-protection for root CODEOWNERS files (this file should not exist and should definitely require approval)
+/CODEOWNERS                                     @hashgraph/release-engineering-managers
+
+# Protect the repository root files
+/README.md                                      @hashgraph/release-engineering-managers @hashgraph/devops-ci
+**/LICENSE                                      @hashgraph/release-engineering-managers
+
+# CodeCov configuration
+**/codecov.yml                                  @hashgraph/release-engineering-managers @hashgraph/devops-ci
+
+# Git Ignore definitions
+**/.gitignore                                   @hashgraph/release-engineering-managers @hashgraph/devops-ci
+**/.gitignore.*                                 @hashgraph/release-engineering-managers @hashgraph/devops-ci
diff --git a/services/address_book_service.proto b/services/address_book_service.proto
@@ -155,12 +155,4 @@ service AddressBookService {
      * Hedera governing council.
      */
     rpc updateNode (proto.Transaction) returns (proto.TransactionResponse);
-
-    /**
-     * A transaction to query the current state of a consensus node in the
-     * network address book state.
-     * <p>
-     * Hedera governing council authorization is REQUIRED for this transaction.
-     */
-    rpc getNodeInfo (proto.Query) returns (proto.Response);
 }
diff --git a/services/basic_types.proto b/services/basic_types.proto
@@ -1208,9 +1208,9 @@ enum HederaFunctionality {
     NodeDelete = 91;
 
     /**
-     * Get Node information
+     * Transfer one or more token balances held by the requesting account to the treasury for each token type.
      */
-    NodeGetInfo = 92;
+    TokenReject = 92;
 
     /**
      * Transfer one or more token balances held by the requesting account to the treasury for each token type.

diff --git a/services/node_create.proto b/services/node_create.proto
@@ -34,6 +34,8 @@ import "basic_types.proto";
  * to join the network, and requires governing council authorization.
  *
  * - A `NodeCreateTransactionBody` MUST be signed by the governing council.
+ * - A `NodeCreateTransactionBody` MUST be signed by the `Key` assigned to the
+ *   `admin_key` field.
  * - The newly created node information SHALL be added to the network address
  *   book information in the network state.
  * - The new entry SHALL be created in "state" but SHALL NOT participate in
@@ -125,4 +127,14 @@ message NodeCreateTransactionBody {
      * This field is OPTIONAL.
      */
     bytes grpc_certificate_hash = 6;
+
+    /**
+    * An administrative key controlled by the node operator.
+     * <p>
+     * This key MUST sign this transaction.<br/>
+     * This key MUST sign each transaction to update this node.<br/>
+     * This field MUST contain a valid `Key` value.<br/>
+     * This field is REQUIRED and MUST NOT be set to an empty `KeyList`.
+     */
+    proto.Key admin_key = 7;
 }
diff --git a/services/node_get_info.proto b/services/node_get_info.proto
diff --git a/services/node_update.proto b/services/node_update.proto
@@ -29,9 +29,10 @@ import "basic_types.proto";
  * Transaction body to modify address book node attributes.
  *
  * - This transaction SHALL enable the node operator, as identified by the
- *   node account, to modify operational attributes of the node.
- * - This transaction MUST be signed by the active `key` for the current node
- *   account or by the Hedera governing council.
+ *   `admin_key`, to modify operational attributes of the node.
+ * - This transaction MUST be signed by the active `admin_key` for the node.
+ * - If this transaction sets a new value for the `admin_key`, then both the
+ *   current `admin_key`, and the new `admin_key` MUST sign this transaction.
  * - This transaction SHALL NOT change any field that is not set (is null) in
  *   this transaction body.
  * - This SHALL create a pending update to the node, but the change SHALL NOT
@@ -148,4 +149,16 @@ message NodeUpdateTransactionBody {
      * If set, the new value SHALL replace the existing hash value.
      */
     google.protobuf.BytesValue grpc_certificate_hash = 7;
+
+    /**
+    * An administrative key controlled by the node operator.
+     * <p>
+     * This field is OPTIONAL.<br/>
+     * If set, this key MUST sign this transaction.<br/>
+     * If set, this key MUST sign each subsequent transaction to
+     * update this node.<br/>
+     * If set, this field MUST contain a valid `Key` value.<br/>
+     * If set, this field MUST NOT be set to an empty `KeyList`.
+     */
+    proto.Key admin_key = 8;
 }
diff --git a/services/query.proto b/services/query.proto
@@ -56,7 +56,6 @@ import "token_get_nft_info.proto";
 import "token_get_nft_infos.proto";
 
 import "get_account_details.proto";
-import "node_get_info.proto";
 
 /**
  * A single query, which is sent from the client to a node. This includes all possible queries. Each
@@ -191,19 +190,5 @@ message Query {
          * Gets all information about an account including allowances granted by the account
          */
         GetAccountDetailsQuery accountDetails = 58;
-
-        /**
-         * Request detail information for a consensus node within the network
-         * address book.
-         * <p>
-         * This query is a privileged action that requires signature from the
-         * Hedera governing council.<br/>
-         * The response, when successful, SHALL contain the full information
-         * currently available, including current status, for the single
-         * consensus node identifier provided.<br/>
-         * The node queried MAY be active, inactive, deleted, or pending a
-         * change at the next network upgrade.
-         */
-        com.hedera.hapi.node.addressbook.NodeGetInfoQuery nodeGetInfo = 59;
     }
 }
diff --git a/services/response.proto b/services/response.proto
@@ -60,7 +60,6 @@ import "token_get_nft_infos.proto";
 import "schedule_get_info.proto";
 
 import "get_account_details.proto";
-import "node_get_info.proto";
 
 /**
  * A single response, which is returned from the node to the client, after the client sent the node
@@ -192,14 +191,5 @@ message Response {
          * Gets all information about an account including allowances granted by the account
          */
         GetAccountDetailsResponse accountDetails = 158;
-
-        /**
-         * A response to a query of the current state of a consensus node
-         * in the network address book state.
-         * <p>
-         * Hedera governing council authorization is REQUIRED for
-         * this transaction.
-         */
-        com.hedera.hapi.node.addressbook.NodeGetInfoResponse nodeGetInfo = 159;
     }
 }