test: Add message submit tests 129-145

hapi/hedera-protobufs/services/consensus_create_topic.proto

@@ -77,7 +77,7 @@ message ConsensusCreateTopicTransactionBody {
      * <p>
      * If unset, custom fees CANNOT be set for this topic.<br/>
      * If not set when the topic is created, this field CANNOT be set via update.
-     * If set when the topic is created, this field CAN be changed via update.
+     * If set when the topic is created, this field MAY be changed via update.
      */
     Key fee_schedule_key = 8;
 
@@ -88,10 +88,10 @@ message ConsensusCreateTopicTransactionBody {
      * If a submit transaction is signed by _any_ key included in this set,
      *  custom fees SHALL NOT be charged for that transaction.
      * <p>
-     * If free_messages_key_list is unset, the following keys are exempt
+     * If fee_exempt_key_list is unset, the following keys are exempt
      *  from custom fees: adminKey, submitKey, fee_schedule_key.
      */
-    repeated Key free_messages_key_list = 9;
+    repeated Key fee_exempt_key_list = 9;
 
     /**
      * A set of custom fee definitions.<br/>

hapi/hedera-protobufs/services/consensus_topic_info.proto

@@ -94,7 +94,7 @@ message ConsensusTopicInfo {
      * <p>
      * If unset, custom fees CANNOT be set for this topic.<br/>
      * If not set when the topic is created, this field CANNOT be set via update.
-     * If set when the topic is created, this field CAN be changed via update.
+     * If set when the topic is created, this field MAY be changed via update.
      */
     Key fee_schedule_key = 10;
 
@@ -105,10 +105,10 @@ message ConsensusTopicInfo {
      * If a submit transaction is signed by _any_ key included in this set,
      *  custom fees SHALL NOT be charged for that transaction.
      * <p>
-     * If free_messages_key_list is unset, the following keys are exempt
+     * If fee_exempt_key_list is unset, the following keys are exempt
      *  from custom fees: adminKey, submitKey, fee_schedule_key.
      */
-    repeated Key free_messages_key_list = 11;
+    repeated Key fee_exempt_key_list = 11;
 
     /**
      * A set of custom fee definitions.<br/>

hapi/hedera-protobufs/services/consensus_update_topic.proto

@@ -94,24 +94,52 @@ message ConsensusUpdateTopicTransactionBody {
      * <p>
      * If unset in state, this field MUST NOT be set.<br/>
      * If unset in this transaction and set in state, the current value SHALL
-     *  be removed.<br/>
-     * If set in this transaction, the existing key MUST sign this transaction.
+     * be removed.<br/>
+     * If this field is set, the existing key MUST sign this transaction.
      */
     Key fee_schedule_key = 10;
 
     /**
-     * A set of keys that are allowed to submit messages to the topic without
+     * A wrapper of a set of keys.<br/>
+     * These keys are permitted to submit messages to the topic without
      * paying the topic's custom fees.
      * <p>
-     * If this list is empty, the current set of keys is unchanged.
+     * If this field is not set, the current set of keys SHALL NOT change.<br/>
+     * If this field is set, but contains an empty list, any existing fee-exempt
+     * keys SHALL be removed.
      */
-    repeated Key free_messages_key_list = 11;
+    FeeExemptKeyList fee_exempt_key_list = 11;
 
     /**
-     * A set of custom fee definitions.<br/>
+     * A wrapper of a set of custom fee definitions.<br/>
      * These are fees to be assessed for each submit to this topic.
      * <p>
-     * If this list is empty, the current set of fees is unchanged.
+     * If this field is not set, the current set of custom fees
+     * SHALL NOT change.<br/>
+     * If this field is set, but contains an empty list, all current custom fees
+     * SHALL be removed.
      */
-    repeated ConsensusCustomFee custom_fees = 12;
+    ConsensusCustomFeeList custom_fees = 12;
+
+    /**
+     * A key validation mode.<br/>
+     * Any key may be updated by a transaction signed by the topic `admin_key`.
+     * Each role key may _also_ sign a transaction to update that key.
+     * If a role key signs an update to change that role key both old
+     * and new key must sign the transaction, _unless_ this field is set
+     * to `NO_VALIDATION`, in which case the _new_ key is not required to
+     * sign the transaction (the existing key is still required).<br/>
+     * The primary intent for this field is to allow a role key (e.g. a
+     * `fee_schedule_key`) holder to "remove" that key from the token by signing
+     * a transaction to set that role key to an empty `KeyList`.
+     * <p>
+     * If set to `FULL_VALIDATION`, either the `admin_key` or _both_ current
+     * and new key MUST sign this transaction to update a "key" field for the
+     * identified token.<br/>
+     * If set to `NO_VALIDATION`, either the `admin_key` or the current
+     * key MUST sign this transaction to update a "key" field for the
+     * identified token.<br/>
+     * This field SHALL be treated as `FULL_VALIDATION` if not set.
+     */
+    TokenKeyValidation key_verification_mode = 13;
 }

hapi/hedera-protobufs/services/custom_fees.proto

@@ -176,7 +176,7 @@ message AssessedCustomFee {
 
 /**
  * A custom fee definition for a consensus topic.
- * <p>
+ *
  * This fee definition is specific to an Hedera Consensus Service (HCS) topic
  * and SHOULD NOT be used in any other context.<br/>
  * All fields for this message are REQUIRED.<br/>
@@ -185,12 +185,12 @@ message AssessedCustomFee {
  */
 message ConsensusCustomFee {
   /**
-     * A fixed custom fee.
-     * <p>
-     * The amount of HBAR or other token described by this `FixedFee` SHALL
-     * be charged to the transction payer for each message submitted to a
-     * topic that assigns this consensus custom fee.
-    */
+   * A fixed custom fee.
+   * <p>
+   * The amount of HBAR or other token described by this `FixedFee` SHALL
+   * be charged to the transction payer for each message submitted to a
+   * topic that assigns this consensus custom fee.
+   */
   FixedFee fixed_fee = 1;
 
   /**
@@ -201,3 +201,44 @@ message ConsensusCustomFee {
    */
   AccountID fee_collector_account_id = 2;
 }
+
+/**
+ * A wrapper around a consensus custom fee list.<br/>
+ * This wrapper exists to enable an update transaction to differentiate between
+ * a field that is not set and an empty list of custom fees.
+ *
+ * An _unset_ field of this type SHALL NOT modify existing values.<br/>
+ * A _set_ field of this type with an empty `fees` list SHALL remove any
+ * existing values.
+ */
+message ConsensusCustomFeeList {
+  /**
+   * A set of custom fee definitions.<br/>
+   * These are fees to be assessed for each submit to a topic.
+   */
+  repeated ConsensusCustomFee fees = 1;
+}
+
+/**
+ * A wrapper for fee exempt key list.<br/>
+ * This wrapper exists to enable an update transaction to differentiate between
+ * a field that is not set and an empty list of keys.
+ *
+ * An _unset_ field of this type SHALL NOT modify existing values.<br/>
+ * A _set_ field of this type with an empty `keys` list SHALL remove any
+ * existing values.
+ */
+message FeeExemptKeyList {
+  /**
+   * A set of keys.
+   * The keys in this list are permitted to submit messages to the
+   * topic without paying the topic's custom fees.
+   * <p>
+   * If a submit transaction is signed by _any_ key included in this set,
+   *  custom fees SHALL NOT be charged for that transaction.
+   * <p>
+   * This list SHALL _implicitly_ include the following keys
+   * `adminKey`, `submitKey`, `fee_schedule_key`.
+   */
+   repeated Key keys = 1;
+}

hapi/hedera-protobufs/services/state/consensus/topic.proto

@@ -104,24 +104,24 @@ message Topic {
     Key submit_key = 10;
 
     /**
-	     * Access control for update/delete of custom fees.
-	     * <p>
-	     * If this field is unset, the current custom fees CANNOT be changed.<br/>
-	     * If this field is set, that `Key` MUST sign any transaction to update
-	     * the custom fee schedule for this topic.
-	     */
+     * Access control for update/delete of custom fees.
+     * <p>
+     * If this field is unset, the current custom fees CANNOT be changed.<br/>
+     * If this field is set, that `Key` MUST sign any transaction to update
+     * the custom fee schedule for this topic.
+     */
     Key fee_schedule_key = 11;
 
     /**
      * A list of "privileged payer" keys.
      * <p>
      * If a submit transaction is signed by _any_ key from this list,
      * custom fees SHALL NOT be charged for that transaction.<br/>
-     * If free_messages_key_list is unset, it SHALL _implicitly_ contain
+     * If fee_exempt_key_list is unset, it SHALL _implicitly_ contain
      * the key `admin_key`, the key `submit_key`, and the key
      * `fee_schedule_key`, if any of those keys are set.
      */
-    repeated Key free_messages_key_list = 12;
+    repeated Key fee_exempt_key_list = 12;
 
     /**
      * A set of custom fee definitions.<br/>

hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusGetTopicInfoHandler.java

@@ -164,7 +164,7 @@ private Optional<ConsensusTopicInfo> infoForTopic(
             info.autoRenewPeriod(Duration.newBuilder().seconds(meta.autoRenewPeriod()));
             if (meta.hasAutoRenewAccountId()) info.autoRenewAccount(meta.autoRenewAccountId());
             if (meta.hasFeeScheduleKey()) info.feeScheduleKey(meta.feeScheduleKey());
-            if (!meta.freeMessagesKeyList().isEmpty()) info.freeMessagesKeyList(meta.freeMessagesKeyList());
+            if (!meta.feeExemptKeyList().isEmpty()) info.feeExemptKeyList(meta.feeExemptKeyList());
             if (!meta.customFees().isEmpty()) info.customFees(meta.customFees());
 
             info.ledgerId(config.id());

hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusUpdateTopicHandler.java

@@ -155,17 +155,7 @@ public void handle(@NonNull final HandleContext handleContext) {
         validateMaybeNewAttributes(handleContext, op, topic);
 
         // Now we apply the mutations to a builder
-        final var builder = new Topic.Builder();
-        // But first copy over the immutable topic attributes to the builder
-        builder.topicId(topic.topicId());
-        builder.sequenceNumber(topic.sequenceNumber());
-        builder.runningHash(topic.runningHash());
-        builder.deleted(topic.deleted());
-        // TODO: added so unit tests pass (fix this when implementing the actual logic)
-        builder.feeScheduleKey(topic.feeScheduleKey());
-        builder.freeMessagesKeyList(topic.freeMessagesKeyList());
-        builder.customFees(topic.customFees());
-        // And then resolve mutable attributes, and put the new topic back
+        final var builder = topic.copyBuilder();
         resolveMutableBuilderAttributes(handleContext, op, builder, topic);
         topicStore.put(builder.build());
     }

hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusGetTopicInfoTest.java

@@ -229,7 +229,7 @@ private ConsensusTopicInfo getExpectedInfo() {
                 .autoRenewPeriod(WELL_KNOWN_AUTO_RENEW_PERIOD)
                 .ledgerId(new BytesConverter().convert("0x03"))
                 .feeScheduleKey(feeScheduleKey)
-                .freeMessagesKeyList(key, anotherKey)
+                .feeExemptKeyList(key, anotherKey)
                 .customFees(customFees)
                 .build();
     }

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/consensus/HapiGetTopicInfo.java

@@ -230,7 +230,7 @@ protected void assertExpectationsGiven(HapiSpec spec) {
         for (var expectedFee : expectedFees) {
             expectedFee.accept(spec, actualFees);
         }
-        var actualFreeMessagesKeys = info.getFreeMessagesKeyListList();
+        var actualFreeMessagesKeys = info.getFeeExemptKeyListList();
         for (var expectedKey : expectedFreeMessagesKeyList) {
             assertTrue(
                     actualFreeMessagesKeys.contains(spec.registry().getKey(expectedKey)),