Update protobufs

Signed-off-by: Zhivko Kelchev <zhivko.kelchev@limechain.tech>

hapi/hedera-protobufs/services/consensus_submit_message.proto

@@ -34,7 +34,6 @@ option java_package = "com.hederahashgraph.api.proto.java";
 option java_multiple_files = true;
 
 import "basic_types.proto";
-import "custom_fees.proto";
 
 /**
  * Consensus message "chunk" detail.<br/>
@@ -108,14 +107,4 @@ message ConsensusSubmitMessageTransactionBody {
      * field SHOULD NOT be set.
      */
     ConsensusMessageChunkInfo chunkInfo = 3;
-
-    /**
-     * The maximum custom fee that the user is willing to pay for the message. This field will be ignored if `accept_all_custom_fees` is set to `true`.
-     */
-    repeated FixedFee max_custom_fees = 4;
-
-    /**
-     * If set to true, the transaction will accept all custom fees from the topic id
-     */
-    bool accept_all_custom_fees = 5;
 }

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

@@ -48,8 +48,8 @@
 import com.hedera.hapi.node.base.TransactionID;
 import com.hedera.hapi.node.consensus.ConsensusSubmitMessageTransactionBody;
 import com.hedera.hapi.node.state.consensus.Topic;
-import com.hedera.hapi.node.transaction.ConsensusCustomFee;
-import com.hedera.hapi.node.transaction.FixedFee;
+import com.hedera.hapi.node.transaction.CustomFeeLimit;
+import com.hedera.hapi.node.transaction.FixedCustomFee;
 import com.hedera.hapi.node.transaction.TransactionBody;
 import com.hedera.node.app.hapi.utils.CommonPbjConverters;
 import com.hedera.node.app.service.consensus.ReadableTopicStore;
@@ -160,8 +160,8 @@
             final var feesToBeCharged = extractFeesToBeCharged(topic.customFees(), handleContext);
 
             // check payer limits or throw
-            if (!op.acceptAllCustomFees()) {
-                validateFeeLimits(feesToBeCharged, op.maxCustomFees());
+            if (!txn.maxCustomFees().isEmpty()) {
+                validateFeeLimits(handleContext.payer(), feesToBeCharged, txn.maxCustomFees());
             }
 
             // create synthetic body and dispatch crypto transfer
@@ -342,7 +342,7 @@
             final var authorizingKeys =
                     keyVerifier.authorizingSimpleKeys().stream().toList();
             final VerificationAssistant callback =
                     (k, ignore) -> simpleKeyVerifierFrom(authorizingKeys).test(k);
             // check if authorizing keys are satisfying any of the fee exempt keys
             for (final var feeExemptKey : feeExemptKeyList) {
                 if (keyVerifier.verificationFor(feeExemptKey, callback).passed()) {
@@ -365,7 +365,7 @@
         });
         return key -> switch (key.key().kind()) {
             case ED25519, ECDSA_SECP256K1 -> cryptoSigs.contains(key);
             default -> false;
         };
     }
 
@@ -376,8 +376,9 @@
      * @param payerCustomFeeLimits List with limits of fees that the payer is willing to pay
      */
     private void validateFeeLimits(
-            @NonNull final List<ConsensusCustomFee> topicCustomFees,
-            @NonNull final List<FixedFee> payerCustomFeeLimits) {
+            @NonNull final AccountID payer,
+            @NonNull final List<FixedCustomFee> topicCustomFees,
+            @NonNull final List<CustomFeeLimit> payerCustomFeeLimits) {
         // Validate the duplication of payer custom fee limits
         validateDuplicationFeeLimits(payerCustomFeeLimits);
 
@@ -388,20 +389,23 @@
         // Validate payer token limits
         tokenFees.forEach((token, feeAmount) -> {
             final boolean isValid = payerCustomFeeLimits.stream()
-                    .filter(fee -> token.equals(fee.denominatingTokenId()))
-                    .anyMatch(fee -> {
-                        validateTrue(fee.amount() >= feeAmount, MAX_CUSTOM_FEE_LIMIT_EXCEEDED);
+                    .filter(maxCustomFee ->
+                            token.equals(maxCustomFee.amountLimit().denominatingTokenId()))
+                    .filter(maxCustomFee -> payer.equals(maxCustomFee.accountId()))
+                    .anyMatch(maxCustomFee -> {
+                        validateTrue(maxCustomFee.amountLimit().amount() >= feeAmount, MAX_CUSTOM_FEE_LIMIT_EXCEEDED);
                         return true;
                     });
             validateTrue(isValid, NO_VALID_MAX_CUSTOM_FEE);
         });
         // Validate payer HBAR limit
         if (hbarFee.get() > 0) {
             final var payerHbarLimit = payerCustomFeeLimits.stream()
-                    .filter(fee -> !fee.hasDenominatingTokenId())
+                    .filter(maxCustomFee -> !maxCustomFee.amountLimit().hasDenominatingTokenId())
+                    .filter(maxCustomFee -> payer.equals(maxCustomFee.accountId()))
                     .findFirst()
                     .orElseThrow(() -> new HandleException(NO_VALID_MAX_CUSTOM_FEE));
-            validateTrue(payerHbarLimit.amount() >= hbarFee.get(), MAX_CUSTOM_FEE_LIMIT_EXCEEDED);
+            validateTrue(payerHbarLimit.amountLimit().amount() >= hbarFee.get(), MAX_CUSTOM_FEE_LIMIT_EXCEEDED);
         }
     }
 
@@ -413,15 +417,15 @@
      * @param context The handle context
      * @return List containing only the fees concerning given payer
      */
-    private List<ConsensusCustomFee> extractFeesToBeCharged(
-            @NonNull final List<ConsensusCustomFee> topicCustomFees, @NonNull final HandleContext context) {
+    private List<FixedCustomFee> extractFeesToBeCharged(
+            @NonNull final List<FixedCustomFee> topicCustomFees, @NonNull final HandleContext context) {
         final var payer = context.payer();
         final var tokenStore = context.storeFactory().readableStore(ReadableTokenStore.class);
         return topicCustomFees.stream()
                 .filter(fee -> {
                     var fixedFee = fee.fixedFeeOrThrow();
                     if (payer.equals(fee.feeCollectorAccountId())) {
                         return false;
                     }
                     if (fixedFee.hasDenominatingTokenId()) {
                         final var denomTokenId = fixedFee.denominatingTokenId();
@@ -441,7 +445,7 @@
      * @param tokenFees Map with total amount per token.
      */
     private void totalAmountToBeCharged(
-            @NonNull List<ConsensusCustomFee> topicCustomFees,
+            @NonNull List<FixedCustomFee> topicCustomFees,
             AtomicReference<Long> hbarFee,
             Map<TokenID, Long> tokenFees) {
         for (final var fee : topicCustomFees) {
@@ -455,16 +459,16 @@
         }
     }
 
-    private void validateDuplicationFeeLimits(@NonNull final List<FixedFee> payerCustomFeeLimits) {
+    private void validateDuplicationFeeLimits(@NonNull final List<CustomFeeLimit> payerCustomFeeLimits) {
         final var htsCustomFeeLimits = payerCustomFeeLimits.stream()
-                .filter(FixedFee::hasDenominatingTokenId)
+                .filter(maxCustomFee -> maxCustomFee.amountLimit().hasDenominatingTokenId())
                 .toList();
         final var hbarCustomFeeLimits = payerCustomFeeLimits.stream()
-                .filter(fee -> !fee.hasDenominatingTokenId())
+                .filter(maxCustomFee -> !maxCustomFee.amountLimit().hasDenominatingTokenId())
                 .toList();
 
         final var htsLimitHasDuplicate = htsCustomFeeLimits.stream()
-                        .map(FixedFee::denominatingTokenId)
+                        .map(maxCustomFee -> maxCustomFee.amountLimit().denominatingTokenId())
                         .collect(Collectors.toSet())
                         .size()
                 != htsCustomFeeLimits.size();

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

@@ -26,7 +26,7 @@
 import com.hedera.hapi.node.base.TokenTransferList;
 import com.hedera.hapi.node.base.TransferList;
 import com.hedera.hapi.node.token.CryptoTransferTransactionBody;
-import com.hedera.hapi.node.transaction.ConsensusCustomFee;
+import com.hedera.hapi.node.transaction.FixedCustomFee;
 import com.hedera.hapi.node.transaction.FixedFee;
 import com.hedera.node.app.service.token.ReadableTokenStore;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -55,12 +55,12 @@
      * @return List of synthetic crypto transfer transaction bodies
      */
     public List<CryptoTransferTransactionBody> assessCustomFee(
-            @NonNull final List<ConsensusCustomFee> customFees, @NonNull final AccountID payer) {
+            @NonNull final List<FixedCustomFee> customFees, @NonNull final AccountID payer) {
         final List<CryptoTransferTransactionBody> transactionBodies = new ArrayList<>();
 
         // build crypto transfer bodies for the first layer of custom fees,
         // if there is a second or third layer it will be assessed in crypto transfer handler
-        for (ConsensusCustomFee fee : customFees) {
+        for (FixedCustomFee fee : customFees) {
             final var tokenTransfers = new ArrayList<TokenTransferList>();
             List<AccountAmount> hbarTransfers = new ArrayList<>();
 
@@ -111,8 +111,8 @@
 
     @VisibleForTesting
     public AccountID getTokenTreasury(TokenID tokenId, ReadableTokenStore tokenStore) {
         final var token = tokenStore.get(tokenId);
         validateTrue(token != null, ResponseCodeEnum.INVALID_TOKEN_ID_IN_CUSTOM_FEES);
         return token.treasuryAccountIdOrThrow();
     }
 }

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

@@ -50,6 +50,8 @@
 import com.hedera.hapi.node.consensus.ConsensusMessageChunkInfo;
 import com.hedera.hapi.node.consensus.ConsensusSubmitMessageTransactionBody;
 import com.hedera.hapi.node.state.consensus.Topic;
+import com.hedera.hapi.node.transaction.CustomFeeLimit;
+import com.hedera.hapi.node.transaction.FixedFee;
 import com.hedera.hapi.node.transaction.TransactionBody;
 import com.hedera.node.app.service.consensus.ReadableTopicStore;
 import com.hedera.node.app.service.consensus.impl.ReadableTopicStoreImpl;
@@ -473,14 +475,27 @@ private TransactionBody newSubmitMessageTxn(final long topicEntityNum, final Str
 
     private TransactionBody newSubmitMessageTxnWithMaxFee() {
         final var txnId = TransactionID.newBuilder().accountID(payerId).build();
+        final var maxCustomFees = List.of(
+                // fungible token limit
+                CustomFeeLimit.newBuilder()
+                        .accountId(payerId)
+                        .amountLimit(FixedFee.newBuilder()
+                                .denominatingTokenId(fungibleTokenId)
+                                .amount(1))
+                        .build(),
+                // hbar limit
+                CustomFeeLimit.newBuilder()
+                        .accountId(payerId)
+                        .amountLimit(FixedFee.newBuilder().amount(1))
+                        .build());
         final var submitMessageBuilder = ConsensusSubmitMessageTransactionBody.newBuilder()
-                .maxCustomFees(tokenCustomFee.fixedFee(), hbarCustomFee.fixedFee())
                 .topicID(TopicID.newBuilder().topicNum(topicEntityNum).build())
                 .message(Bytes.wrap("Message for test-" + Instant.now() + "."
                         + Instant.now().getNano()));
         return TransactionBody.newBuilder()
                 .transactionID(txnId)
                 .consensusSubmitMessage(submitMessageBuilder.build())
+                .maxCustomFees(maxCustomFees)
                 .build();
     }
 

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

@@ -124,18 +124,18 @@ public class ConsensusTestBase {
     protected final long sequenceNumber = 1L;
     protected final long autoRenewSecs = 100L;
     protected final Instant consensusTimestamp = Instant.ofEpochSecond(1_234_567L);
-    protected final ConsensusCustomFee tokenCustomFee = ConsensusCustomFee.newBuilder()
+    protected final FixedCustomFee tokenCustomFee = FixedCustomFee.newBuilder()
             .fixedFee(FixedFee.newBuilder()
                     .denominatingTokenId(fungibleTokenId)
                     .amount(1)
                     .build())
             .feeCollectorAccountId(anotherPayer)
             .build();
-    protected final ConsensusCustomFee hbarCustomFee = ConsensusCustomFee.newBuilder()
+    protected final FixedCustomFee hbarCustomFee = FixedCustomFee.newBuilder()
             .fixedFee(FixedFee.newBuilder().amount(1).build())
             .feeCollectorAccountId(anotherPayer)
             .build();
-    protected final List<ConsensusCustomFee> customFees = List.of(tokenCustomFee, hbarCustomFee);
+    protected final List<FixedCustomFee> customFees = List.of(tokenCustomFee, hbarCustomFee);
 
     protected Topic topic;
 

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/consensus/HapiMessageSubmit.java

@@ -31,7 +31,6 @@
 import com.hedera.services.bdd.spec.HapiSpec;
 import com.hedera.services.bdd.spec.fees.AdapterUtils;
 import com.hedera.services.bdd.spec.transactions.HapiTxnOp;
-import com.hederahashgraph.api.proto.java.ConsensusCustomFee;
 import com.hederahashgraph.api.proto.java.ConsensusMessageChunkInfo;
 import com.hederahashgraph.api.proto.java.ConsensusSubmitMessageTransactionBody;
 import com.hederahashgraph.api.proto.java.FeeData;
@@ -125,16 +124,6 @@ public HapiMessageSubmit chunkInfo(
         return chunkInfo(totalChunks, chunkNumber);
     }
 
-    public HapiMessageSubmit maxCustomFee(Function<HapiSpec, ConsensusCustomFee> f) {
-        maxCustomFeeList.add(f);
-        return this;
-    }
-
-    public HapiMessageSubmit acceptAllCustomFees(boolean acceptAllFees) {
-        this.acceptAllCustomFees = acceptAllFees;
-        return this;
-    }
-
     @Override
     protected Consumer<TransactionBody.Builder> opBodyDef(final HapiSpec spec) throws Throwable {
         final TopicID id = resolveTopicId(spec);
@@ -146,12 +135,6 @@ protected Consumer<TransactionBody.Builder> opBodyDef(final HapiSpec spec) throw
                             if (clearMessage) {
                                 b.clearMessage();
                             }
-                            if (!maxCustomFeeList.isEmpty()) {
-                                for (final var supplier : maxCustomFeeList) {
-                                    b.addMaxCustomFees(supplier.apply(spec).getFixedFee());
-                                }
-                            }
-                            b.setAcceptAllCustomFees(acceptAllCustomFees);
                             if (totalChunks.isPresent() && chunkNumber.isPresent()) {
                                 final ConsensusMessageChunkInfo chunkInfo = ConsensusMessageChunkInfo.newBuilder()
                                         .setInitialTransactionID(initialTransactionID.orElse(asTransactionID(