Merge branch 'develop' into dependabot/github_actions/gradle/actions-…

…4.2.2

hapi/hedera-protobufs/block/stream/output/smart_contract_service.proto

@@ -40,7 +40,7 @@ option java_package = "com.hedera.hapi.block.stream.output.protoc";
 // <<<pbj.java_package = "com.hedera.hapi.block.stream.output">>> This comment is special code for setting PBJ Compiler java package
 option java_multiple_files = true;
 
-import "contract_call_local.proto";
+import "contract_types.proto";
 import "sidecar_file.proto";
 
 /**

hapi/hedera-protobufs/block/stream/output/transaction_output.proto

@@ -51,7 +51,7 @@ import "stream/output/smart_contract_service.proto";
  * >> Only a few transactions produce output that is not in the transaction
  * >> and also not reflected in state changes. All other transaction types
  * >> are _currently_ not included here. We have, however, allocated names
- * >> and indexes for those transaction types to preserve consistency if we
+ * >> for those transaction types to preserve consistency if we
  * >> add them later.
  *
  * <!--

hapi/hedera-protobufs/block/stream/record_file_item.proto

@@ -35,7 +35,6 @@ option java_package = "com.hedera.hapi.block.stream.protoc";
 // <<<pbj.java_package = "com.hedera.hapi.block.stream">>> This comment is special code for setting PBJ Compiler java package
 option java_multiple_files = true;
 
-import "basic_types.proto";
 import "timestamp.proto";
 
 /**

hapi/hedera-protobufs/services/address_book_service.proto

@@ -1,3 +1,14 @@
+/**
+ * # Address Book Service API
+ * GRPC service definitions for the Hedera Address Book Service (HABS).
+ *
+ * ### 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 proto;
@@ -21,8 +32,6 @@ package proto;
 option java_package = "com.hederahashgraph.service.proto.java";
 // <<<pbj.java_package = "com.hedera.hapi.node.addressbook">>> This comment is special code for setting PBJ Compiler java package
 
-import "query.proto";
-import "response.proto";
 import "transaction_response.proto";
 import "transaction.proto";
 
@@ -38,9 +47,9 @@ import "transaction.proto";
  *
  * ### For a node creation transaction.
  * - The node operator SHALL create a `createNode` transaction.
- *    - The node operator SHALL sign this transaction with the active `key` for
- *      the account to be assigned as the "node account".
- *    - The node operator MUST deliver the signed transaction to the Hedera
+ *    - The node operator MUST sign this transaction with the `Key`
+ *      set as the `admin_key` for the new `Node`.
+ *    - The node operator SHALL deliver the signed transaction to the Hedera
  *      council representative.
  *    - The Hedera council representative SHALL arrange for council members to
  *      review and sign the transaction.
@@ -50,8 +59,8 @@ import "transaction.proto";
  * - Upon receipt of a valid and signed node creation transaction the network
  *   software SHALL
  *    - Validate the threshold signature for the Hedera governing council
- *    - Validate the signature of the active `key` for the account to be
- *      assigned as the "node account".
+ *    - Validate the signature of the `Key` provided as the new `admin_key`
+ *      for the `Node`.
  *    - Create the new node in state, this new node SHALL NOT be active in the
  *      network at this time.
  *    - When executing the next `freeze` transaction with `freeze_type` set to
@@ -63,8 +72,8 @@ import "transaction.proto";
  * - The node operator or Hedera council representative SHALL create a
  *   `deleteNode` transaction.
  *    - If the node operator creates the transaction
- *       - The node operator MUST sign this transaction with the active `key`
- *         for the account assigned as the "node account".
+ *       - The node operator MUST sign this transaction with the `Key`
+ *         set as the `admin_key` for the existing `Node`.
  *       - The node operator SHALL deliver the signed transaction to the Hedera
  *         council representative.
  *    - The Hedera council representative SHALL arrange for council members to
@@ -74,7 +83,7 @@ import "transaction.proto";
  *      network.
  * - Upon receipt of a valid and signed node deletion transaction the network
  *   software SHALL
- *    - Validate the threshold signature for the Hedera governing council
+ *    - Validate the signature for the Hedera governing council
  *    - Remove the existing node from network state. The node SHALL still
  *      be active in the network at this time.
  *    - When executing the next `freeze` transaction with `freeze_type` set to
@@ -107,7 +116,7 @@ import "transaction.proto";
  */
 service AddressBookService {
     /**
-     * A transaction to create a new consensus node in the network.
+     * A transaction to create a new consensus node in the network
      * address book.
      * <p>
      * This transaction, once complete, SHALL add a new consensus node to the