From 1327b7b6aeaf216f3014b032b7d8bc1a4b437b1e Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Sat, 11 Jan 2025 21:50:28 -0800 Subject: [PATCH 01/21] Initial commit Signed-off-by: Kim Rader --- .../services/atomic_batch.proto | 44 ++++++++ .../services/basic_types.proto | 5 + .../services/response_code.proto | 15 +++ .../services/transaction.proto | 6 +- .../services/transaction_body.proto | 10 ++ .../services/util_service.proto | 10 ++ .../java/com/hedera/hapi/util/HapiUtils.java | 19 ++-- .../app/workflows/TransactionChecker.java | 4 +- .../node/app/workflows/TransactionInfo.java | 5 +- .../dispatcher/TransactionDispatcher.java | 1 + .../dispatcher/TransactionHandlers.java | 4 +- .../handle/HandleWorkflowModule.java | 3 +- .../app/blocks/BlockStreamBuilderTest.java | 10 +- .../app/throttle/ThrottleAccumulatorTest.java | 7 +- .../app/workflows/TransactionCheckerTest.java | 101 +----------------- .../workflows/TransactionScenarioBuilder.java | 3 +- .../handle/DispatchHandleContextTest.java | 16 +-- .../handle/dispatch/RecordFinalizerTest.java | 4 +- .../steps/HollowAccountCompletionsTest.java | 6 +- .../steps/PlatformStateUpdatesTest.java | 4 +- .../handle/steps/SystemFileUpdatesTest.java | 5 +- .../ingest/IngestWorkflowImplTest.java | 4 +- .../node/config/data/ApiPermissionConfig.java | 4 + .../HandleSystemContractOperationsTest.java | 9 +- .../HevmStaticTransactionFactoryTest.java | 12 +-- .../test/handlers/TokenMintHandlerTest.java | 4 +- .../impl/handlers/AtomicBatchHandler.java | 72 +++++++++++++ .../util/impl/handlers/UtilHandlers.java | 11 +- .../impl/test/handlers/UtilHandlersTest.java | 11 +- .../service/util/UtilServiceDefinition.java | 7 +- .../util/UtilServiceDefinitionTest.java | 5 +- 31 files changed, 238 insertions(+), 183 deletions(-) create mode 100644 hapi/hedera-protobufs/services/atomic_batch.proto create mode 100644 hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java diff --git a/hapi/hedera-protobufs/services/atomic_batch.proto b/hapi/hedera-protobufs/services/atomic_batch.proto new file mode 100644 index 000000000000..74eed67eeacc --- /dev/null +++ b/hapi/hedera-protobufs/services/atomic_batch.proto @@ -0,0 +1,44 @@ +/** + * # Atomic Batch + * A transaction that groups multiple transactions together, and executes + * them atomically. + * + * ### 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; + +/* + * Copyright (C) 2018-2024 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +option java_package = "com.hederahashgraph.api.proto.java"; +// <<>> This comment is special code for setting PBJ Compiler java package +option java_multiple_files = true; + +import "transaction.proto"; + +/** + * Create an atomic batch. + */ +message AtomicBatchTransactionBody { + repeated Transaction transactions = 1; +} diff --git a/hapi/hedera-protobufs/services/basic_types.proto b/hapi/hedera-protobufs/services/basic_types.proto index 298fa5245eb3..3b1430d86cfd 100644 --- a/hapi/hedera-protobufs/services/basic_types.proto +++ b/hapi/hedera-protobufs/services/basic_types.proto @@ -1652,6 +1652,11 @@ enum HederaFunctionality { * Submit a signature of a state root hash gossiped to other nodes */ StateSignatureTransaction = 100; + + /** + * Submit a batch of transactions to run atomically + */ + AtomicBatch = 101; } /** diff --git a/hapi/hedera-protobufs/services/response_code.proto b/hapi/hedera-protobufs/services/response_code.proto index 0157876e2be7..46b0cb50928c 100644 --- a/hapi/hedera-protobufs/services/response_code.proto +++ b/hapi/hedera-protobufs/services/response_code.proto @@ -1640,4 +1640,19 @@ enum ResponseCodeEnum { * approximately four million times with typical network configuration.) */ RECURSIVE_SCHEDULING_LIMIT_REACHED = 374; + + /** + * The list of batch transactions is empty + */ + BATCH_LIST_EMPTY = 375; + + /** + * The list of batch transactions contains duplicated transactions + */ + BATCH_LIST_CONTAINS_DUPLICATES = 376; + + /** + * The list of batch transactions contains null values + */ + BATCH_LIST_CONTAINS_NULL_VALUES = 377; } diff --git a/hapi/hedera-protobufs/services/transaction.proto b/hapi/hedera-protobufs/services/transaction.proto index cffca41d7217..c00e92ca7763 100644 --- a/hapi/hedera-protobufs/services/transaction.proto +++ b/hapi/hedera-protobufs/services/transaction.proto @@ -35,7 +35,6 @@ option java_package = "com.hederahashgraph.api.proto.java"; option java_multiple_files = true; import "basic_types.proto"; -import "transaction_body.proto"; /** * A wrapper around signed transaction bytes.
@@ -52,10 +51,13 @@ import "transaction_body.proto"; */ message Transaction { /** + * TransactionBody body = 1 [deprecated = true]; * Replaced with `signedTransactionBytes`.
* The body of the transaction. */ - TransactionBody body = 1 [deprecated = true]; + // FUTURE - Uncomment when https://github.com/hashgraph/pbj/issues/339 is fixed; + // currently the PBJ-generated unit tests fail when using reserved ordinals +// reserved 1; /** * Replaced with `signedTransactionBytes`.
diff --git a/hapi/hedera-protobufs/services/transaction_body.proto b/hapi/hedera-protobufs/services/transaction_body.proto index b41e58563849..c399c9f21b87 100644 --- a/hapi/hedera-protobufs/services/transaction_body.proto +++ b/hapi/hedera-protobufs/services/transaction_body.proto @@ -98,6 +98,7 @@ import "schedule_sign.proto"; import "node_stake_update.proto"; import "util_prng.proto"; +import "atomic_batch.proto"; import "node_create.proto"; import "node_update.proto"; @@ -194,6 +195,13 @@ message TransactionBody { */ string memo = 6; + /** +* The entire public key of the trusted batch assembler. +* +* Only Ed25519 and ECDSA(secp256k1) keys and hence signatures are currently supported. +*/ + Key batchKey = 66; + // The fields here are ordered in strictly ascending field ordinal // order due to limitations in PBJ. oneof data { @@ -560,5 +568,7 @@ message TransactionBody { * A transaction body for signature of a state root hash gossiped to other nodes */ com.hedera.hapi.platform.event.StateSignatureTransaction state_signature_transaction = 65; + + AtomicBatchTransactionBody atomicBatch = 67; } } diff --git a/hapi/hedera-protobufs/services/util_service.proto b/hapi/hedera-protobufs/services/util_service.proto index e55f1f2c9388..8596bc1be9bf 100644 --- a/hapi/hedera-protobufs/services/util_service.proto +++ b/hapi/hedera-protobufs/services/util_service.proto @@ -55,4 +55,14 @@ service UtilService { * [UtilPrngTransactionBody](#proto.UtilPrngTransactionBody) */ rpc prng (Transaction) returns (TransactionResponse); + + + /** + * Execute a batch of transactions atomically. + *

+ * All transactions in the batch will be executed in order, and if any + * transaction fails, the entire batch will fail. + // TODO: Add more details about the batch transaction + */ + rpc atomicBatch (Transaction) returns (TransactionResponse); } diff --git a/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java b/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java index bb67fb0980e1..b2c6c8b22dad 100644 --- a/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java +++ b/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java @@ -179,6 +179,7 @@ public static int countOfCryptographicKeys(@NonNull final Key key) { public static HederaFunctionality functionOf(final TransactionBody txn) throws UnknownHederaFunctionality { return switch (txn.data().kind()) { + case ATOMIC_BATCH -> HederaFunctionality.ATOMIC_BATCH; case CONSENSUS_CREATE_TOPIC -> HederaFunctionality.CONSENSUS_CREATE_TOPIC; case CONSENSUS_UPDATE_TOPIC -> HederaFunctionality.CONSENSUS_UPDATE_TOPIC; case CONSENSUS_DELETE_TOPIC -> HederaFunctionality.CONSENSUS_DELETE_TOPIC; @@ -201,14 +202,21 @@ public static HederaFunctionality functionOf(final TransactionBody txn) throws U case FILE_UPDATE -> HederaFunctionality.FILE_UPDATE; case FILE_DELETE -> HederaFunctionality.FILE_DELETE; case FREEZE -> HederaFunctionality.FREEZE; + case NODE_CREATE -> HederaFunctionality.NODE_CREATE; + case NODE_DELETE -> HederaFunctionality.NODE_DELETE; case NODE_STAKE_UPDATE -> HederaFunctionality.NODE_STAKE_UPDATE; + case NODE_UPDATE -> HederaFunctionality.NODE_UPDATE; case SCHEDULE_CREATE -> HederaFunctionality.SCHEDULE_CREATE; case SCHEDULE_SIGN -> HederaFunctionality.SCHEDULE_SIGN; case SCHEDULE_DELETE -> HederaFunctionality.SCHEDULE_DELETE; + case STATE_SIGNATURE_TRANSACTION -> HederaFunctionality.STATE_SIGNATURE_TRANSACTION; case SYSTEM_DELETE -> HederaFunctionality.SYSTEM_DELETE; case SYSTEM_UNDELETE -> HederaFunctionality.SYSTEM_UNDELETE; + case TOKEN_AIRDROP -> HederaFunctionality.TOKEN_AIRDROP; case TOKEN_ASSOCIATE -> HederaFunctionality.TOKEN_ASSOCIATE_TO_ACCOUNT; case TOKEN_BURN -> HederaFunctionality.TOKEN_BURN; + case TOKEN_CANCEL_AIRDROP -> HederaFunctionality.TOKEN_CANCEL_AIRDROP; + case TOKEN_CLAIM_AIRDROP -> HederaFunctionality.TOKEN_CLAIM_AIRDROP; case TOKEN_CREATION -> HederaFunctionality.TOKEN_CREATE; case TOKEN_DELETION -> HederaFunctionality.TOKEN_DELETE; case TOKEN_DISSOCIATE -> HederaFunctionality.TOKEN_DISSOCIATE_FROM_ACCOUNT; @@ -217,22 +225,15 @@ public static HederaFunctionality functionOf(final TransactionBody txn) throws U case TOKEN_GRANT_KYC -> HederaFunctionality.TOKEN_GRANT_KYC_TO_ACCOUNT; case TOKEN_MINT -> HederaFunctionality.TOKEN_MINT; case TOKEN_PAUSE -> HederaFunctionality.TOKEN_PAUSE; + case TOKEN_REJECT -> HederaFunctionality.TOKEN_REJECT; case TOKEN_REVOKE_KYC -> HederaFunctionality.TOKEN_REVOKE_KYC_FROM_ACCOUNT; case TOKEN_UNFREEZE -> HederaFunctionality.TOKEN_UNFREEZE_ACCOUNT; case TOKEN_UNPAUSE -> HederaFunctionality.TOKEN_UNPAUSE; case TOKEN_UPDATE -> HederaFunctionality.TOKEN_UPDATE; case TOKEN_UPDATE_NFTS -> HederaFunctionality.TOKEN_UPDATE_NFTS; case TOKEN_WIPE -> HederaFunctionality.TOKEN_ACCOUNT_WIPE; - case UTIL_PRNG -> HederaFunctionality.UTIL_PRNG; case UNCHECKED_SUBMIT -> HederaFunctionality.UNCHECKED_SUBMIT; - case NODE_CREATE -> HederaFunctionality.NODE_CREATE; - case NODE_UPDATE -> HederaFunctionality.NODE_UPDATE; - case NODE_DELETE -> HederaFunctionality.NODE_DELETE; - case TOKEN_REJECT -> HederaFunctionality.TOKEN_REJECT; - case TOKEN_AIRDROP -> HederaFunctionality.TOKEN_AIRDROP; - case TOKEN_CANCEL_AIRDROP -> HederaFunctionality.TOKEN_CANCEL_AIRDROP; - case TOKEN_CLAIM_AIRDROP -> HederaFunctionality.TOKEN_CLAIM_AIRDROP; - case STATE_SIGNATURE_TRANSACTION -> HederaFunctionality.STATE_SIGNATURE_TRANSACTION; + case UTIL_PRNG -> HederaFunctionality.UTIL_PRNG; case UNSET -> throw new UnknownHederaFunctionality(); }; } diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java index 56fd293a2bd8..bdc09ecd557a 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -275,7 +275,7 @@ private void checkTransactionDeprecation(@NonNull final Transaction tx) throws P // as long as the transaction ALSO has either #2 or #3 populated. This seems really odd, and ideally // we would be able to remove support for #1 entirely. To do this, we need metrics to see if anyone // is using #1 in any way. - if (tx.hasBody() || tx.hasSigs()) { + if (tx.hasSigs()) { superDeprecatedCounter.increment(); } diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java index 433932867c7c..dd477c8e0b36 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,8 +38,7 @@ * of this class, so we don't have to parse it all again later.

* * @param transaction The transaction itself - * @param txBody the deserialized {@link TransactionBody} (either from the {@link Transaction#body()} or - * from the {@link Transaction#signedTransactionBytes()}). + * @param txBody the deserialized {@link TransactionBody} (from the {@link Transaction#signedTransactionBytes()}). * @param transactionID the validated {@link TransactionID} extracted from {@link #txBody} * @param payerID the validated {@link AccountID} of the payer extracted from {@link #transactionID} * @param signatureMap the {@link SignatureMap} (either from {@link Transaction#sigMap()} or diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java index 8fefb69a281d..30d8901729a2 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java @@ -210,6 +210,7 @@ private TransactionHandler getHandler(@NonNull final TransactionBody txBody) { case TOKEN_CANCEL_AIRDROP -> handlers.tokenCancelAirdropHandler(); case UTIL_PRNG -> handlers.utilPrngHandler(); + case ATOMIC_BATCH -> handlers.atomicBatchHandler(); case SYSTEM_DELETE -> switch (txBody.systemDeleteOrThrow().id().kind()) { case CONTRACT_ID -> handlers.contractSystemDeleteHandler(); diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionHandlers.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionHandlers.java index cf926000bfc7..c8cc5922e0bd 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionHandlers.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionHandlers.java @@ -69,6 +69,7 @@ import com.hedera.node.app.service.token.impl.handlers.TokenUnpauseHandler; import com.hedera.node.app.service.token.impl.handlers.TokenUpdateHandler; import com.hedera.node.app.service.token.impl.handlers.TokenUpdateNftsHandler; +import com.hedera.node.app.service.util.impl.handlers.AtomicBatchHandler; import com.hedera.node.app.service.util.impl.handlers.UtilPrngHandler; import edu.umd.cs.findbugs.annotations.NonNull; @@ -130,4 +131,5 @@ public record TransactionHandlers( @NonNull NodeUpdateHandler nodeUpdateHandler, @NonNull NodeDeleteHandler nodeDeleteHandler, @NonNull TokenClaimAirdropHandler tokenClaimAirdropHandler, - @NonNull UtilPrngHandler utilPrngHandler) {} + @NonNull UtilPrngHandler utilPrngHandler, + @NonNull AtomicBatchHandler atomicBatchHandler) {} diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/HandleWorkflowModule.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/HandleWorkflowModule.java index 58462ec0ea76..34f97292619a 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/HandleWorkflowModule.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/HandleWorkflowModule.java @@ -164,6 +164,7 @@ static TransactionHandlers provideTransactionHandlers( addressBookHandlers.nodeUpdateHandler(), addressBookHandlers.nodeDeleteHandler(), tokenHandlers.tokenClaimAirdropHandler(), - utilHandlers.prngHandler()); + utilHandlers.prngHandler(), + utilHandlers.atomicBatchHandler()); } } diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java index 341fb53911b9..1ab578c74bf7 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,10 +36,8 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; -import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.AssessedCustomFee; import com.hedera.hapi.node.transaction.ExchangeRateSet; -import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.streams.ContractStateChanges; import com.hedera.node.app.blocks.impl.BlockStreamBuilder; @@ -61,9 +59,9 @@ public class BlockStreamBuilderTest { public static final int ENTROPY_NUMBER = 87372879; public static final String MEMO = "Yo Memo"; private Transaction transaction = Transaction.newBuilder() - .body(TransactionBody.newBuilder() - .cryptoTransfer(CryptoTransferTransactionBody.newBuilder().build()) - .build()) + // .body(TransactionBody.newBuilder() + // .cryptoTransfer(CryptoTransferTransactionBody.newBuilder().build()) + // .build()) .build(); private @Mock TransactionID transactionID; private final Bytes transactionBytes = Bytes.wrap("Hello Tester"); diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java index a69ebaf820cb..abee0f0c7c55 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1610,7 +1610,8 @@ private TransactionInfo scheduleCreate( .transactionID(TransactionID.newBuilder().accountID(PAYER_ID).build()) .scheduleCreate(schedule) .build(); - final var txn = Transaction.newBuilder().body(body).build(); + final var txn = Transaction.newBuilder().build(); + // final var txn = Schedule.newBuilder().originalCreateTransaction(body).build(); return new TransactionInfo( txn, body, @@ -1628,7 +1629,7 @@ private TransactionInfo scheduleSign(ScheduleID scheduleID) { .transactionID(TransactionID.newBuilder().accountID(PAYER_ID).build()) .scheduleSign(schedule) .build(); - final var txn = Transaction.newBuilder().body(body).build(); + final var txn = Transaction.newBuilder().build(); return new TransactionInfo( txn, body, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java index 3cfbf371c59f..938de998d8e8 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,8 +40,6 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Duration; -import com.hedera.hapi.node.base.Signature; -import com.hedera.hapi.node.base.SignatureList; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.SignaturePair; import com.hedera.hapi.node.base.Timestamp; @@ -289,30 +287,6 @@ void happyDeprecatedPath() throws PreCheckException { assertThat(counterMetric("SuperDeprTxnsRcv").get()).isZero(); } - @Test - @DisplayName("A transaction with super deprecated fields alone will throw") - @SuppressWarnings("deprecation") - void parseAndCheckWithSuperDeprecatedFields() throws PreCheckException { - // Given a transaction using the super deprecated fields - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .build(); - inputBuffer = Bytes.wrap(asByteArray(localTx)); - - // When we check, then we get a PreCheckException with INVALID_TRANSACTION_BODY - final var transaction = checker.parse(inputBuffer); - assertThatThrownBy(() -> checker.check(transaction, null)) - .isInstanceOf(PreCheckException.class) - .has(responseCode(INVALID_TRANSACTION_BODY)); - - // And the super deprecation counter has been incremented - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - // But the deprecation counter has not - assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); - } - @Test @DisplayName("If the transaction bytes are not valid protobuf, it will fail") void badTransactionProtobuf() { @@ -405,79 +379,6 @@ void happyWithDeprecatedFields() throws PreCheckException { // But the super deprecation counter has not assertThat(counterMetric("SuperDeprTxnsRcv").get()).isZero(); } - - @Test - @DisplayName("A transaction with super deprecated fields alone will throw") - @SuppressWarnings("deprecation") - void happyWithSuperDeprecatedFields() { - // Given a transaction using the super deprecated fields - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .build(); - - // When we check, then we get a PreCheckException with INVALID_TRANSACTION_BODY - assertThatThrownBy(() -> checker.check(localTx, null)) - .isInstanceOf(PreCheckException.class) - .has(responseCode(INVALID_TRANSACTION_BODY)); - - // And the super deprecation counter has been incremented - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - // But the deprecation counter has not - assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); - } - - @Test - @DisplayName( - "A transaction with super deprecated fields and signedTransactionBytes ignores super deprecated fields") - @SuppressWarnings("deprecation") - void checkWithSuperDeprecatedFieldsAndSignedTransactionBytes() throws PreCheckException { - // Given a transaction using the super deprecated fields and signedTransactionBytes - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .signedTransactionBytes(asBytes(SignedTransaction.PROTOBUF, signedTx)) - .build(); - - // When we check - final var info = checker.check(localTx, null); - // Then the parsed data is as we expected - assertThat(info.transaction()).isEqualTo(localTx); - assertThat(info.txBody()).isEqualTo(txBody); - assertThat(info.signatureMap()).isEqualTo(signatureMap); - assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); - // And the super-deprecated counter is incremented, but not the deprecated counter - assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - } - - @Test - @DisplayName( - "A transaction with super deprecated fields and deprecated fields ignores super deprecated fields") - @SuppressWarnings("deprecation") - void checkWithSuperDeprecatedFieldsAndDeprecatedFields() throws PreCheckException { - // Given a transaction using the super deprecated fields and signedTransactionBytes - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .bodyBytes(asBytes(TransactionBody.PROTOBUF, txBody)) - .sigMap(signatureMap) - .build(); - - // When we check - final var info = checker.check(localTx, null); - // Then the parsed data is as we expected - assertThat(info.transaction()).isEqualTo(localTx); - assertThat(info.txBody()).isEqualTo(txBody); - assertThat(info.signatureMap()).isEqualTo(signatureMap); - assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); - // And the super-deprecated counter is incremented, and also the deprecated counter - assertThat(counterMetric("DeprTxnsRcv").get()).isEqualTo(1); - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - } } @Nested diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java index aa9e897edaf5..0a138451b7c4 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ public TransactionInfo txInfo() { final var signedTx = SignedTransaction.newBuilder().bodyBytes(signedbytes).build(); final var tx = Transaction.newBuilder() - .body(body) .signedTransactionBytes(asBytes(SignedTransaction.PROTOBUF, signedTx)) .build(); return new TransactionInfo(tx, body, SignatureMap.DEFAULT, signedbytes, function, null); diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java index 70ff7adeec05..298933e9941a 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -274,12 +274,7 @@ public class DispatchHandleContextTest extends StateTestBase implements Scenario .consensusSubmitMessage(ConsensusSubmitMessageTransactionBody.DEFAULT) .build(); private static final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().body(txBody).build(), - txBody, - SignatureMap.DEFAULT, - Bytes.EMPTY, - CRYPTO_TRANSFER, - null); + Transaction.newBuilder().build(), txBody, SignatureMap.DEFAULT, Bytes.EMPTY, CRYPTO_TRANSFER, null); private static final TransactionBody MISSING_PAYER_ID = TransactionBody.newBuilder().transactionID(TransactionID.DEFAULT).build(); @@ -752,12 +747,7 @@ private DispatchHandleContext createContext( } final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().body(txBody).build(), - txBody, - SignatureMap.DEFAULT, - Bytes.EMPTY, - function, - null); + Transaction.newBuilder().build(), txBody, SignatureMap.DEFAULT, Bytes.EMPTY, function, null); return new DispatchHandleContext( CONSENSUS_NOW, creatorInfo, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java index 8433a9f0f139..c80b07791a53 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -96,7 +96,7 @@ public class RecordFinalizerTest { .build(); private static final TransactionBody TX_BODY = asTxn(TRANSFER_BODY, PAYER_ID, CONSENSUS_NOW); private static final TransactionInfo TXN_INFO = new TransactionInfo( - Transaction.newBuilder().body(TX_BODY).build(), + Transaction.newBuilder().build(), TX_BODY, SignatureMap.DEFAULT, Bytes.EMPTY, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java index f7d049c16412..4d1f6c8228ed 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -221,7 +221,7 @@ void completeHollowAccountsWithEthereumTransaction() { .ethereumTransaction(EthereumTransactionBody.DEFAULT) .build(); final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().body(txnBody).build(), + Transaction.newBuilder().build(), txnBody, SignatureMap.DEFAULT, transactionBytes, @@ -253,7 +253,7 @@ void ignoreEthereumTransactionIfNoCorrespondingSigs() { .ethereumTransaction(EthereumTransactionBody.DEFAULT) .build(); final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().body(txnBody).build(), + Transaction.newBuilder().build(), txnBody, SignatureMap.DEFAULT, transactionBytes, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java index 804e36cebdea..e0c31e216295 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java @@ -120,13 +120,11 @@ void setUp() { @Test void testMethodsWithInvalidArguments() { // given - final var txBody = simpleCryptoTransfer().body(); + final var txBody = TransactionBody.DEFAULT; // then assertThatThrownBy(() -> subject.handleTxBody(null, txBody, DEFAULT_CONFIG)) .isInstanceOf(NullPointerException.class); - assertThatThrownBy(() -> subject.handleTxBody(state, txBody, DEFAULT_CONFIG)) - .isInstanceOf(NullPointerException.class); assertThatThrownBy(() -> subject.handleTxBody(state, null, DEFAULT_CONFIG)) .isInstanceOf(NullPointerException.class); } diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java index 6eaa0e86074d..747bd5cb1d1b 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -104,7 +104,7 @@ void setUp() { @Test void testMethodsWithInvalidArguments() { // given - final var txBody = simpleCryptoTransfer().body(); + final var txBody = TransactionBody.DEFAULT; // then assertThatThrownBy(() -> new SystemFileUpdates(null, exchangeRateManager, feeManager, throttleServiceManager)) @@ -119,7 +119,6 @@ void testMethodsWithInvalidArguments() { assertThatThrownBy(() -> subject.handleTxBody(null, txBody)).isInstanceOf(NullPointerException.class); assertThatThrownBy(() -> subject.handleTxBody(state, null)).isInstanceOf(NullPointerException.class); - assertThatThrownBy(() -> subject.handleTxBody(state, txBody)).isInstanceOf(NullPointerException.class); } @Test diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java index f49f31cccede..f15ad1551362 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -134,7 +134,7 @@ void setup() throws PreCheckException { // TODO Mock out the metrics to return objects we can inspect later // Mock out the onset to always return a valid parsed object - transaction = Transaction.newBuilder().body(transactionBody).build(); + transaction = Transaction.newBuilder().build(); when(transactionChecker.parse(requestBuffer)).thenReturn(transaction); final var transactionInfo = new TransactionInfo( transaction, diff --git a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/ApiPermissionConfig.java b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/ApiPermissionConfig.java index 7dab1706417e..bc2ed9932e1d 100644 --- a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/ApiPermissionConfig.java +++ b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/ApiPermissionConfig.java @@ -16,6 +16,7 @@ package com.hedera.node.config.data; +import static com.hedera.hapi.node.base.HederaFunctionality.ATOMIC_BATCH; import static com.hedera.hapi.node.base.HederaFunctionality.CONSENSUS_CREATE_TOPIC; import static com.hedera.hapi.node.base.HederaFunctionality.CONSENSUS_DELETE_TOPIC; import static com.hedera.hapi.node.base.HederaFunctionality.CONSENSUS_GET_TOPIC_INFO; @@ -119,6 +120,7 @@ * @param deleteAllowances the permission for {@link HederaFunctionality#CRYPTO_DELETE_ALLOWANCE} * functionality * @param utilPrng the permission for {@link HederaFunctionality#UTIL_PRNG} functionality + * @param atomicBatch the permission for {@link HederaFunctionality#ATOMIC_BATCH} functionality * @param createFile the permission for {@link HederaFunctionality#FILE_CREATE} functionality * @param updateFile the permission for {@link HederaFunctionality#FILE_UPDATE} functionality * @param deleteFile the permission for {@link HederaFunctionality#FILE_DELETE} functionality @@ -204,6 +206,7 @@ public record ApiPermissionConfig( @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange approveAllowances, @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange deleteAllowances, @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange utilPrng, + @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange atomicBatch, @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange createFile, @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange updateFile, @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange deleteFile, @@ -340,6 +343,7 @@ public record ApiPermissionConfig( permissionKeys.put(TOKEN_GET_ACCOUNT_NFT_INFOS, c -> c.tokenGetAccountNftInfos); permissionKeys.put(TOKEN_FEE_SCHEDULE_UPDATE, c -> c.tokenFeeScheduleUpdate); permissionKeys.put(UTIL_PRNG, c -> c.utilPrng); + permissionKeys.put(ATOMIC_BATCH, c -> c.atomicBatch); permissionKeys.put(NODE_CREATE, c -> c.createNode); permissionKeys.put(NODE_UPDATE, c -> c.updateNode); permissionKeys.put(NODE_DELETE, c -> c.deleteNode); diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java index 467bc9112bf7..4d090c65b73c 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,6 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HandleSystemContractOperations; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; @@ -190,11 +189,7 @@ void externalizesPreemptedAsExpected() { @Test void externalizeSuccessfulResultWithTransactionBodyTest() { - var transaction = Transaction.newBuilder() - .body(TransactionBody.newBuilder() - .transactionID(TransactionID.DEFAULT) - .build()) - .build(); + var transaction = Transaction.newBuilder().build(); var contractFunctionResult = SystemContractUtils.successResultOfZeroValueTraceable( 0, org.apache.tuweni.bytes.Bytes.EMPTY, diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java index c862f9d62dc7..fba925812da2 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,11 +31,8 @@ import com.hedera.hapi.node.base.QueryHeader; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallLocalQuery; import com.hedera.hapi.node.transaction.Query; -import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.infra.HevmStaticTransactionFactory; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.HandleException; @@ -97,12 +94,7 @@ void fromQueryWorkWithSenderAndUsesPriorityAddress() { @Test void fromQueryWorkWithNoSender() { - final var transactionID = - TransactionID.newBuilder().accountID(SENDER_ID).build(); - final var txBody = - TransactionBody.newBuilder().transactionID(transactionID).build(); - final var payment = Transaction.newBuilder().body(txBody).build(); - final var queryHeader = QueryHeader.newBuilder().payment(payment).build(); + final var queryHeader = QueryHeader.newBuilder().build(); given(context.createStore(ReadableAccountStore.class)).willReturn(accountStore); final var query = Query.newBuilder() diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java index 3fd3e1834580..1be4b0b0ac85 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -293,7 +293,7 @@ private TransactionBody givenMintTxn(final TokenID tokenId, final List me .tokenMint(builder.build()) .build(); - final var txn = Transaction.newBuilder().body(txnBody).build(); + final var txn = Transaction.DEFAULT; recordBuilder.transaction(txn); given(handleContext.body()).willReturn(txnBody); diff --git a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java new file mode 100644 index 000000000000..2395c96e6615 --- /dev/null +++ b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.hedera.node.app.service.util.impl.handlers; + +import static java.util.Objects.requireNonNull; + +import com.hedera.hapi.node.base.HederaFunctionality; +import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.node.app.spi.workflows.HandleContext; +import com.hedera.node.app.spi.workflows.HandleException; +import com.hedera.node.app.spi.workflows.PreCheckException; +import com.hedera.node.app.spi.workflows.PreHandleContext; +import com.hedera.node.app.spi.workflows.TransactionHandler; +import edu.umd.cs.findbugs.annotations.NonNull; +import javax.inject.Inject; +import javax.inject.Singleton; + +/** + * This class contains all workflow-related functionality regarding {@link HederaFunctionality#ATOMIC_BATCH}. + */ +@Singleton +public class AtomicBatchHandler implements TransactionHandler { + /** + * Constructs a {@link AtomicBatchHandler} + */ + @Inject + public AtomicBatchHandler() { + // exists for Dagger injection + } + + /** + * Performs checks independent of state or context. + * + * @param txn the transaction to check + */ + @Override + public void pureChecks(@NonNull final TransactionBody txn) throws PreCheckException { + // TODO + } + + /** + * This method is called during the pre-handle workflow. + * + * @param context the {@link PreHandleContext} which collects all information + * @throws PreCheckException if any issue happens on the pre handle level + */ + @Override + public void preHandle(@NonNull final PreHandleContext context) throws PreCheckException { + requireNonNull(context); + // TODO + } + + @Override + public void handle(@NonNull final HandleContext handleContext) throws HandleException { + requireNonNull(handleContext); + // TODO + } +} diff --git a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilHandlers.java b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilHandlers.java index cb0c308aa424..78f319f655cf 100644 --- a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilHandlers.java +++ b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilHandlers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,13 +25,20 @@ public class UtilHandlers { private final UtilPrngHandler prngHandler; + private final AtomicBatchHandler atomicBatchHandler; @Inject - public UtilHandlers(@NonNull final UtilPrngHandler prngHandler) { + public UtilHandlers( + @NonNull final UtilPrngHandler prngHandler, @NonNull final AtomicBatchHandler atomicBatchHandler) { this.prngHandler = Objects.requireNonNull(prngHandler, "prngHandler must not be null"); + this.atomicBatchHandler = Objects.requireNonNull(atomicBatchHandler, "atomicBatchHandler must not be null"); } public UtilPrngHandler prngHandler() { return prngHandler; } + + public AtomicBatchHandler atomicBatchHandler() { + return atomicBatchHandler; + } } diff --git a/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilHandlersTest.java b/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilHandlersTest.java index 6fd72b7614ee..3d97862bbb6c 100644 --- a/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilHandlersTest.java +++ b/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilHandlersTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; +import com.hedera.node.app.service.util.impl.handlers.AtomicBatchHandler; import com.hedera.node.app.service.util.impl.handlers.UtilHandlers; import com.hedera.node.app.service.util.impl.handlers.UtilPrngHandler; import org.junit.jupiter.api.BeforeEach; @@ -26,17 +27,23 @@ class UtilHandlersTest { private UtilPrngHandler prngHandler; + private AtomicBatchHandler atomicBatchHandler; private UtilHandlers utilHandlers; @BeforeEach public void setUp() { prngHandler = mock(UtilPrngHandler.class); - utilHandlers = new UtilHandlers(prngHandler); + atomicBatchHandler = mock(AtomicBatchHandler.class); + utilHandlers = new UtilHandlers(prngHandler, atomicBatchHandler); } @Test void prngHandlerReturnsCorrectInstance() { assertEquals(prngHandler, utilHandlers.prngHandler(), "prngHandler does not return correct instance"); + assertEquals( + atomicBatchHandler, + utilHandlers.atomicBatchHandler(), + "atomicBatchHandler does not return correct instance"); } } diff --git a/hedera-node/hedera-util-service/src/main/java/com/hedera/node/app/service/util/UtilServiceDefinition.java b/hedera-node/hedera-util-service/src/main/java/com/hedera/node/app/service/util/UtilServiceDefinition.java index 23ccc3e6b668..0f6f40c354e3 100644 --- a/hedera-node/hedera-util-service/src/main/java/com/hedera/node/app/service/util/UtilServiceDefinition.java +++ b/hedera-node/hedera-util-service/src/main/java/com/hedera/node/app/service/util/UtilServiceDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,8 +30,9 @@ public final class UtilServiceDefinition implements RpcServiceDefinition { public static final UtilServiceDefinition INSTANCE = new UtilServiceDefinition(); - private static final Set> methods = - Set.of(new RpcMethodDefinition<>("prng", Transaction.class, TransactionResponse.class)); + private static final Set> methods = Set.of( + new RpcMethodDefinition<>("prng", Transaction.class, TransactionResponse.class), + new RpcMethodDefinition<>("atomicBatch", Transaction.class, TransactionResponse.class)); private UtilServiceDefinition() { // Forbid instantiation diff --git a/hedera-node/hedera-util-service/src/test/java/com/hedera/node/app/service/util/UtilServiceDefinitionTest.java b/hedera-node/hedera-util-service/src/test/java/com/hedera/node/app/service/util/UtilServiceDefinitionTest.java index cdd726767579..858bce990c7c 100644 --- a/hedera-node/hedera-util-service/src/test/java/com/hedera/node/app/service/util/UtilServiceDefinitionTest.java +++ b/hedera-node/hedera-util-service/src/test/java/com/hedera/node/app/service/util/UtilServiceDefinitionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,6 +34,7 @@ void methodsDefined() { final var methods = UtilServiceDefinition.INSTANCE.methods(); Assertions.assertThat(methods) .containsExactlyInAnyOrder( - new RpcMethodDefinition<>("prng", Transaction.class, TransactionResponse.class)); + new RpcMethodDefinition<>("prng", Transaction.class, TransactionResponse.class), + new RpcMethodDefinition<>("atomicBatch", Transaction.class, TransactionResponse.class)); } } From 7a787be5404ee2ef51bc13bc0f534784063523d7 Mon Sep 17 00:00:00 2001 From: Lev Povolotsky Date: Mon, 13 Jan 2025 15:50:33 -0500 Subject: [PATCH 02/21] add feature flag Signed-off-by: Lev Povolotsky --- .../app/config/ServicesConfigExtension.java | 2 ++ .../node/config/data/AtomicBatchConfig.java | 24 +++++++++++++++++++ .../impl/handlers/AtomicBatchHandler.java | 5 ++++ 3 files changed, 31 insertions(+) create mode 100644 hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java index fb348a255366..3ceffc680514 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java @@ -38,6 +38,7 @@ import com.hedera.node.config.converter.SemanticVersionConverter; import com.hedera.node.config.data.AccountsConfig; import com.hedera.node.config.data.ApiPermissionConfig; +import com.hedera.node.config.data.AtomicBatchConfig; import com.hedera.node.config.data.AutoCreationConfig; import com.hedera.node.config.data.AutoRenew2Config; import com.hedera.node.config.data.AutoRenewConfig; @@ -127,6 +128,7 @@ public Set> getConfigDataTypes() { TopicsConfig.class, TraceabilityConfig.class, UtilPrngConfig.class, + AtomicBatchConfig.class, VersionConfig.class, TssConfig.class); } diff --git a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java new file mode 100644 index 000000000000..0279300e8fca --- /dev/null +++ b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.hedera.node.config.data; + +import com.hedera.node.config.NetworkProperty; +import com.swirlds.config.api.ConfigData; +import com.swirlds.config.api.ConfigProperty; + +@ConfigData("utilPrng") +public record AtomicBatchConfig(@ConfigProperty(defaultValue = "true") @NetworkProperty boolean isEnabled) {} diff --git a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java index 2395c96e6615..ed4596b47e34 100644 --- a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java +++ b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java @@ -25,6 +25,8 @@ import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.PreHandleContext; import com.hedera.node.app.spi.workflows.TransactionHandler; +import com.hedera.node.config.data.AtomicBatchConfig; +import com.hedera.node.config.data.UtilPrngConfig; import edu.umd.cs.findbugs.annotations.NonNull; import javax.inject.Inject; import javax.inject.Singleton; @@ -68,5 +70,8 @@ public void preHandle(@NonNull final PreHandleContext context) throws PreCheckEx public void handle(@NonNull final HandleContext handleContext) throws HandleException { requireNonNull(handleContext); // TODO + if (!handleContext.configuration().getConfigData(AtomicBatchConfig.class).isEnabled()) { + return; + } } } From d501d47fb1053f166e525748b17cfa41dc7f925a Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Mon, 13 Jan 2025 13:52:52 -0800 Subject: [PATCH 03/21] Delete deprecated field `body` from transaction.proto Signed-off-by: Kim Rader --- .../services/transaction.proto | 6 +- .../app/workflows/TransactionChecker.java | 4 +- .../node/app/workflows/TransactionInfo.java | 5 +- .../app/blocks/BlockStreamBuilderTest.java | 10 +- .../app/throttle/ThrottleAccumulatorTest.java | 6 +- .../app/workflows/TransactionCheckerTest.java | 101 +----------------- .../workflows/TransactionScenarioBuilder.java | 3 +- .../handle/DispatchHandleContextTest.java | 16 +-- .../handle/dispatch/RecordFinalizerTest.java | 4 +- .../steps/HollowAccountCompletionsTest.java | 6 +- .../steps/PlatformStateUpdatesTest.java | 4 +- .../handle/steps/SystemFileUpdatesTest.java | 5 +- .../ingest/IngestWorkflowImplTest.java | 4 +- .../HandleSystemContractOperationsTest.java | 9 +- .../HevmStaticTransactionFactoryTest.java | 12 +-- .../test/handlers/TokenMintHandlerTest.java | 4 +- 16 files changed, 36 insertions(+), 163 deletions(-) diff --git a/hapi/hedera-protobufs/services/transaction.proto b/hapi/hedera-protobufs/services/transaction.proto index cffca41d7217..c00e92ca7763 100644 --- a/hapi/hedera-protobufs/services/transaction.proto +++ b/hapi/hedera-protobufs/services/transaction.proto @@ -35,7 +35,6 @@ option java_package = "com.hederahashgraph.api.proto.java"; option java_multiple_files = true; import "basic_types.proto"; -import "transaction_body.proto"; /** * A wrapper around signed transaction bytes.
@@ -52,10 +51,13 @@ import "transaction_body.proto"; */ message Transaction { /** + * TransactionBody body = 1 [deprecated = true]; * Replaced with `signedTransactionBytes`.
* The body of the transaction. */ - TransactionBody body = 1 [deprecated = true]; + // FUTURE - Uncomment when https://github.com/hashgraph/pbj/issues/339 is fixed; + // currently the PBJ-generated unit tests fail when using reserved ordinals +// reserved 1; /** * Replaced with `signedTransactionBytes`.
diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java index 56fd293a2bd8..bdc09ecd557a 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -275,7 +275,7 @@ private void checkTransactionDeprecation(@NonNull final Transaction tx) throws P // as long as the transaction ALSO has either #2 or #3 populated. This seems really odd, and ideally // we would be able to remove support for #1 entirely. To do this, we need metrics to see if anyone // is using #1 in any way. - if (tx.hasBody() || tx.hasSigs()) { + if (tx.hasSigs()) { superDeprecatedCounter.increment(); } diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java index 433932867c7c..dd477c8e0b36 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,8 +38,7 @@ * of this class, so we don't have to parse it all again later.

* * @param transaction The transaction itself - * @param txBody the deserialized {@link TransactionBody} (either from the {@link Transaction#body()} or - * from the {@link Transaction#signedTransactionBytes()}). + * @param txBody the deserialized {@link TransactionBody} (from the {@link Transaction#signedTransactionBytes()}). * @param transactionID the validated {@link TransactionID} extracted from {@link #txBody} * @param payerID the validated {@link AccountID} of the payer extracted from {@link #transactionID} * @param signatureMap the {@link SignatureMap} (either from {@link Transaction#sigMap()} or diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java index 341fb53911b9..1ab578c74bf7 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,10 +36,8 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; -import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.AssessedCustomFee; import com.hedera.hapi.node.transaction.ExchangeRateSet; -import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.streams.ContractStateChanges; import com.hedera.node.app.blocks.impl.BlockStreamBuilder; @@ -61,9 +59,9 @@ public class BlockStreamBuilderTest { public static final int ENTROPY_NUMBER = 87372879; public static final String MEMO = "Yo Memo"; private Transaction transaction = Transaction.newBuilder() - .body(TransactionBody.newBuilder() - .cryptoTransfer(CryptoTransferTransactionBody.newBuilder().build()) - .build()) + // .body(TransactionBody.newBuilder() + // .cryptoTransfer(CryptoTransferTransactionBody.newBuilder().build()) + // .build()) .build(); private @Mock TransactionID transactionID; private final Bytes transactionBytes = Bytes.wrap("Hello Tester"); diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java index a69ebaf820cb..e06908e0e7af 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1610,7 +1610,7 @@ private TransactionInfo scheduleCreate( .transactionID(TransactionID.newBuilder().accountID(PAYER_ID).build()) .scheduleCreate(schedule) .build(); - final var txn = Transaction.newBuilder().body(body).build(); + final var txn = Transaction.newBuilder().build(); return new TransactionInfo( txn, body, @@ -1628,7 +1628,7 @@ private TransactionInfo scheduleSign(ScheduleID scheduleID) { .transactionID(TransactionID.newBuilder().accountID(PAYER_ID).build()) .scheduleSign(schedule) .build(); - final var txn = Transaction.newBuilder().body(body).build(); + final var txn = Transaction.newBuilder().build(); return new TransactionInfo( txn, body, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java index 3cfbf371c59f..938de998d8e8 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,8 +40,6 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Duration; -import com.hedera.hapi.node.base.Signature; -import com.hedera.hapi.node.base.SignatureList; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.SignaturePair; import com.hedera.hapi.node.base.Timestamp; @@ -289,30 +287,6 @@ void happyDeprecatedPath() throws PreCheckException { assertThat(counterMetric("SuperDeprTxnsRcv").get()).isZero(); } - @Test - @DisplayName("A transaction with super deprecated fields alone will throw") - @SuppressWarnings("deprecation") - void parseAndCheckWithSuperDeprecatedFields() throws PreCheckException { - // Given a transaction using the super deprecated fields - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .build(); - inputBuffer = Bytes.wrap(asByteArray(localTx)); - - // When we check, then we get a PreCheckException with INVALID_TRANSACTION_BODY - final var transaction = checker.parse(inputBuffer); - assertThatThrownBy(() -> checker.check(transaction, null)) - .isInstanceOf(PreCheckException.class) - .has(responseCode(INVALID_TRANSACTION_BODY)); - - // And the super deprecation counter has been incremented - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - // But the deprecation counter has not - assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); - } - @Test @DisplayName("If the transaction bytes are not valid protobuf, it will fail") void badTransactionProtobuf() { @@ -405,79 +379,6 @@ void happyWithDeprecatedFields() throws PreCheckException { // But the super deprecation counter has not assertThat(counterMetric("SuperDeprTxnsRcv").get()).isZero(); } - - @Test - @DisplayName("A transaction with super deprecated fields alone will throw") - @SuppressWarnings("deprecation") - void happyWithSuperDeprecatedFields() { - // Given a transaction using the super deprecated fields - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .build(); - - // When we check, then we get a PreCheckException with INVALID_TRANSACTION_BODY - assertThatThrownBy(() -> checker.check(localTx, null)) - .isInstanceOf(PreCheckException.class) - .has(responseCode(INVALID_TRANSACTION_BODY)); - - // And the super deprecation counter has been incremented - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - // But the deprecation counter has not - assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); - } - - @Test - @DisplayName( - "A transaction with super deprecated fields and signedTransactionBytes ignores super deprecated fields") - @SuppressWarnings("deprecation") - void checkWithSuperDeprecatedFieldsAndSignedTransactionBytes() throws PreCheckException { - // Given a transaction using the super deprecated fields and signedTransactionBytes - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .signedTransactionBytes(asBytes(SignedTransaction.PROTOBUF, signedTx)) - .build(); - - // When we check - final var info = checker.check(localTx, null); - // Then the parsed data is as we expected - assertThat(info.transaction()).isEqualTo(localTx); - assertThat(info.txBody()).isEqualTo(txBody); - assertThat(info.signatureMap()).isEqualTo(signatureMap); - assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); - // And the super-deprecated counter is incremented, but not the deprecated counter - assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - } - - @Test - @DisplayName( - "A transaction with super deprecated fields and deprecated fields ignores super deprecated fields") - @SuppressWarnings("deprecation") - void checkWithSuperDeprecatedFieldsAndDeprecatedFields() throws PreCheckException { - // Given a transaction using the super deprecated fields and signedTransactionBytes - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .bodyBytes(asBytes(TransactionBody.PROTOBUF, txBody)) - .sigMap(signatureMap) - .build(); - - // When we check - final var info = checker.check(localTx, null); - // Then the parsed data is as we expected - assertThat(info.transaction()).isEqualTo(localTx); - assertThat(info.txBody()).isEqualTo(txBody); - assertThat(info.signatureMap()).isEqualTo(signatureMap); - assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); - // And the super-deprecated counter is incremented, and also the deprecated counter - assertThat(counterMetric("DeprTxnsRcv").get()).isEqualTo(1); - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - } } @Nested diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java index aa9e897edaf5..0a138451b7c4 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ public TransactionInfo txInfo() { final var signedTx = SignedTransaction.newBuilder().bodyBytes(signedbytes).build(); final var tx = Transaction.newBuilder() - .body(body) .signedTransactionBytes(asBytes(SignedTransaction.PROTOBUF, signedTx)) .build(); return new TransactionInfo(tx, body, SignatureMap.DEFAULT, signedbytes, function, null); diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java index 70ff7adeec05..298933e9941a 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -274,12 +274,7 @@ public class DispatchHandleContextTest extends StateTestBase implements Scenario .consensusSubmitMessage(ConsensusSubmitMessageTransactionBody.DEFAULT) .build(); private static final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().body(txBody).build(), - txBody, - SignatureMap.DEFAULT, - Bytes.EMPTY, - CRYPTO_TRANSFER, - null); + Transaction.newBuilder().build(), txBody, SignatureMap.DEFAULT, Bytes.EMPTY, CRYPTO_TRANSFER, null); private static final TransactionBody MISSING_PAYER_ID = TransactionBody.newBuilder().transactionID(TransactionID.DEFAULT).build(); @@ -752,12 +747,7 @@ private DispatchHandleContext createContext( } final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().body(txBody).build(), - txBody, - SignatureMap.DEFAULT, - Bytes.EMPTY, - function, - null); + Transaction.newBuilder().build(), txBody, SignatureMap.DEFAULT, Bytes.EMPTY, function, null); return new DispatchHandleContext( CONSENSUS_NOW, creatorInfo, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java index 8433a9f0f139..c80b07791a53 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -96,7 +96,7 @@ public class RecordFinalizerTest { .build(); private static final TransactionBody TX_BODY = asTxn(TRANSFER_BODY, PAYER_ID, CONSENSUS_NOW); private static final TransactionInfo TXN_INFO = new TransactionInfo( - Transaction.newBuilder().body(TX_BODY).build(), + Transaction.newBuilder().build(), TX_BODY, SignatureMap.DEFAULT, Bytes.EMPTY, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java index f7d049c16412..4d1f6c8228ed 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -221,7 +221,7 @@ void completeHollowAccountsWithEthereumTransaction() { .ethereumTransaction(EthereumTransactionBody.DEFAULT) .build(); final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().body(txnBody).build(), + Transaction.newBuilder().build(), txnBody, SignatureMap.DEFAULT, transactionBytes, @@ -253,7 +253,7 @@ void ignoreEthereumTransactionIfNoCorrespondingSigs() { .ethereumTransaction(EthereumTransactionBody.DEFAULT) .build(); final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().body(txnBody).build(), + Transaction.newBuilder().build(), txnBody, SignatureMap.DEFAULT, transactionBytes, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java index 6879ed150fbb..8ddb26b8c60a 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java @@ -126,13 +126,11 @@ void setUp() { @Test void testMethodsWithInvalidArguments() { // given - final var txBody = simpleCryptoTransfer().body(); + final var txBody = TransactionBody.DEFAULT; // then assertThatThrownBy(() -> subject.handleTxBody(null, txBody, DEFAULT_CONFIG)) .isInstanceOf(NullPointerException.class); - assertThatThrownBy(() -> subject.handleTxBody(state, txBody, DEFAULT_CONFIG)) - .isInstanceOf(NullPointerException.class); assertThatThrownBy(() -> subject.handleTxBody(state, null, DEFAULT_CONFIG)) .isInstanceOf(NullPointerException.class); } diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java index 6eaa0e86074d..747bd5cb1d1b 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -104,7 +104,7 @@ void setUp() { @Test void testMethodsWithInvalidArguments() { // given - final var txBody = simpleCryptoTransfer().body(); + final var txBody = TransactionBody.DEFAULT; // then assertThatThrownBy(() -> new SystemFileUpdates(null, exchangeRateManager, feeManager, throttleServiceManager)) @@ -119,7 +119,6 @@ void testMethodsWithInvalidArguments() { assertThatThrownBy(() -> subject.handleTxBody(null, txBody)).isInstanceOf(NullPointerException.class); assertThatThrownBy(() -> subject.handleTxBody(state, null)).isInstanceOf(NullPointerException.class); - assertThatThrownBy(() -> subject.handleTxBody(state, txBody)).isInstanceOf(NullPointerException.class); } @Test diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java index f49f31cccede..f15ad1551362 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -134,7 +134,7 @@ void setup() throws PreCheckException { // TODO Mock out the metrics to return objects we can inspect later // Mock out the onset to always return a valid parsed object - transaction = Transaction.newBuilder().body(transactionBody).build(); + transaction = Transaction.newBuilder().build(); when(transactionChecker.parse(requestBuffer)).thenReturn(transaction); final var transactionInfo = new TransactionInfo( transaction, diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java index 467bc9112bf7..4d090c65b73c 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,6 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HandleSystemContractOperations; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; @@ -190,11 +189,7 @@ void externalizesPreemptedAsExpected() { @Test void externalizeSuccessfulResultWithTransactionBodyTest() { - var transaction = Transaction.newBuilder() - .body(TransactionBody.newBuilder() - .transactionID(TransactionID.DEFAULT) - .build()) - .build(); + var transaction = Transaction.newBuilder().build(); var contractFunctionResult = SystemContractUtils.successResultOfZeroValueTraceable( 0, org.apache.tuweni.bytes.Bytes.EMPTY, diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java index c862f9d62dc7..fba925812da2 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,11 +31,8 @@ import com.hedera.hapi.node.base.QueryHeader; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallLocalQuery; import com.hedera.hapi.node.transaction.Query; -import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.infra.HevmStaticTransactionFactory; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.HandleException; @@ -97,12 +94,7 @@ void fromQueryWorkWithSenderAndUsesPriorityAddress() { @Test void fromQueryWorkWithNoSender() { - final var transactionID = - TransactionID.newBuilder().accountID(SENDER_ID).build(); - final var txBody = - TransactionBody.newBuilder().transactionID(transactionID).build(); - final var payment = Transaction.newBuilder().body(txBody).build(); - final var queryHeader = QueryHeader.newBuilder().payment(payment).build(); + final var queryHeader = QueryHeader.newBuilder().build(); given(context.createStore(ReadableAccountStore.class)).willReturn(accountStore); final var query = Query.newBuilder() diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java index 3fd3e1834580..1be4b0b0ac85 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -293,7 +293,7 @@ private TransactionBody givenMintTxn(final TokenID tokenId, final List me .tokenMint(builder.build()) .build(); - final var txn = Transaction.newBuilder().body(txnBody).build(); + final var txn = Transaction.DEFAULT; recordBuilder.transaction(txn); given(handleContext.body()).willReturn(txnBody); From d90294654960b1c20f44463776121175ff502ca7 Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Mon, 13 Jan 2025 13:58:06 -0800 Subject: [PATCH 04/21] Spotless Signed-off-by: Kim Rader --- .../com/hedera/node/app/config/ServicesConfigExtension.java | 2 +- .../java/com/hedera/node/config/data/AtomicBatchConfig.java | 2 +- .../app/service/util/impl/handlers/AtomicBatchHandler.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java index 3ceffc680514..5c0c84d2dcb5 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java index 0279300e8fca..5e89e5a851e0 100644 --- a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java +++ b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java index ed4596b47e34..050316351fcf 100644 --- a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java +++ b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java @@ -26,7 +26,6 @@ import com.hedera.node.app.spi.workflows.PreHandleContext; import com.hedera.node.app.spi.workflows.TransactionHandler; import com.hedera.node.config.data.AtomicBatchConfig; -import com.hedera.node.config.data.UtilPrngConfig; import edu.umd.cs.findbugs.annotations.NonNull; import javax.inject.Inject; import javax.inject.Singleton; @@ -70,7 +69,10 @@ public void preHandle(@NonNull final PreHandleContext context) throws PreCheckEx public void handle(@NonNull final HandleContext handleContext) throws HandleException { requireNonNull(handleContext); // TODO - if (!handleContext.configuration().getConfigData(AtomicBatchConfig.class).isEnabled()) { + if (!handleContext + .configuration() + .getConfigData(AtomicBatchConfig.class) + .isEnabled()) { return; } } From 7a32d3d8921648934db06613992f75c3437d7d50 Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Tue, 14 Jan 2025 10:50:41 -0800 Subject: [PATCH 05/21] Fix feature flag config Signed-off-by: Kim Rader --- .../java/com/hedera/node/config/data/AtomicBatchConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java index 5e89e5a851e0..087c9afcda11 100644 --- a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java +++ b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java @@ -20,5 +20,5 @@ import com.swirlds.config.api.ConfigData; import com.swirlds.config.api.ConfigProperty; -@ConfigData("utilPrng") +@ConfigData("atomicBatch") public record AtomicBatchConfig(@ConfigProperty(defaultValue = "true") @NetworkProperty boolean isEnabled) {} From 889e4a8948193e43bcd874e3cd61aaaf04a3be22 Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Tue, 14 Jan 2025 12:41:32 -0800 Subject: [PATCH 06/21] Revert changes Signed-off-by: Kim Rader --- .../app/workflows/TransactionChecker.java | 4 +- .../node/app/workflows/TransactionInfo.java | 5 +- .../app/blocks/BlockStreamBuilderTest.java | 10 +- .../app/throttle/ThrottleAccumulatorTest.java | 6 +- .../app/workflows/TransactionCheckerTest.java | 101 +++++++++++++++++- .../workflows/TransactionScenarioBuilder.java | 3 +- .../handle/DispatchHandleContextTest.java | 16 ++- .../handle/dispatch/RecordFinalizerTest.java | 4 +- .../steps/HollowAccountCompletionsTest.java | 6 +- .../steps/PlatformStateUpdatesTest.java | 4 +- .../handle/steps/SystemFileUpdatesTest.java | 5 +- .../ingest/IngestWorkflowImplTest.java | 4 +- .../HandleSystemContractOperationsTest.java | 9 +- .../HevmStaticTransactionFactoryTest.java | 12 ++- .../test/handlers/TokenMintHandlerTest.java | 4 +- 15 files changed, 161 insertions(+), 32 deletions(-) diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java index bdc09ecd557a..56fd293a2bd8 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -275,7 +275,7 @@ private void checkTransactionDeprecation(@NonNull final Transaction tx) throws P // as long as the transaction ALSO has either #2 or #3 populated. This seems really odd, and ideally // we would be able to remove support for #1 entirely. To do this, we need metrics to see if anyone // is using #1 in any way. - if (tx.hasSigs()) { + if (tx.hasBody() || tx.hasSigs()) { superDeprecatedCounter.increment(); } diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java index dd477c8e0b36..433932867c7c 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,8 @@ * of this class, so we don't have to parse it all again later.

* * @param transaction The transaction itself - * @param txBody the deserialized {@link TransactionBody} (from the {@link Transaction#signedTransactionBytes()}). + * @param txBody the deserialized {@link TransactionBody} (either from the {@link Transaction#body()} or + * from the {@link Transaction#signedTransactionBytes()}). * @param transactionID the validated {@link TransactionID} extracted from {@link #txBody} * @param payerID the validated {@link AccountID} of the payer extracted from {@link #transactionID} * @param signatureMap the {@link SignatureMap} (either from {@link Transaction#sigMap()} or diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java index 1ab578c74bf7..341fb53911b9 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,8 +36,10 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; +import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.AssessedCustomFee; import com.hedera.hapi.node.transaction.ExchangeRateSet; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.streams.ContractStateChanges; import com.hedera.node.app.blocks.impl.BlockStreamBuilder; @@ -59,9 +61,9 @@ public class BlockStreamBuilderTest { public static final int ENTROPY_NUMBER = 87372879; public static final String MEMO = "Yo Memo"; private Transaction transaction = Transaction.newBuilder() - // .body(TransactionBody.newBuilder() - // .cryptoTransfer(CryptoTransferTransactionBody.newBuilder().build()) - // .build()) + .body(TransactionBody.newBuilder() + .cryptoTransfer(CryptoTransferTransactionBody.newBuilder().build()) + .build()) .build(); private @Mock TransactionID transactionID; private final Bytes transactionBytes = Bytes.wrap("Hello Tester"); diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java index e06908e0e7af..a69ebaf820cb 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1610,7 +1610,7 @@ private TransactionInfo scheduleCreate( .transactionID(TransactionID.newBuilder().accountID(PAYER_ID).build()) .scheduleCreate(schedule) .build(); - final var txn = Transaction.newBuilder().build(); + final var txn = Transaction.newBuilder().body(body).build(); return new TransactionInfo( txn, body, @@ -1628,7 +1628,7 @@ private TransactionInfo scheduleSign(ScheduleID scheduleID) { .transactionID(TransactionID.newBuilder().accountID(PAYER_ID).build()) .scheduleSign(schedule) .build(); - final var txn = Transaction.newBuilder().build(); + final var txn = Transaction.newBuilder().body(body).build(); return new TransactionInfo( txn, body, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java index 938de998d8e8..3cfbf371c59f 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,6 +40,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Duration; +import com.hedera.hapi.node.base.Signature; +import com.hedera.hapi.node.base.SignatureList; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.SignaturePair; import com.hedera.hapi.node.base.Timestamp; @@ -287,6 +289,30 @@ void happyDeprecatedPath() throws PreCheckException { assertThat(counterMetric("SuperDeprTxnsRcv").get()).isZero(); } + @Test + @DisplayName("A transaction with super deprecated fields alone will throw") + @SuppressWarnings("deprecation") + void parseAndCheckWithSuperDeprecatedFields() throws PreCheckException { + // Given a transaction using the super deprecated fields + final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); + final var localTx = Transaction.newBuilder() + .body(txBody) + .sigs(SignatureList.newBuilder().sigs(sig).build()) + .build(); + inputBuffer = Bytes.wrap(asByteArray(localTx)); + + // When we check, then we get a PreCheckException with INVALID_TRANSACTION_BODY + final var transaction = checker.parse(inputBuffer); + assertThatThrownBy(() -> checker.check(transaction, null)) + .isInstanceOf(PreCheckException.class) + .has(responseCode(INVALID_TRANSACTION_BODY)); + + // And the super deprecation counter has been incremented + assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); + // But the deprecation counter has not + assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); + } + @Test @DisplayName("If the transaction bytes are not valid protobuf, it will fail") void badTransactionProtobuf() { @@ -379,6 +405,79 @@ void happyWithDeprecatedFields() throws PreCheckException { // But the super deprecation counter has not assertThat(counterMetric("SuperDeprTxnsRcv").get()).isZero(); } + + @Test + @DisplayName("A transaction with super deprecated fields alone will throw") + @SuppressWarnings("deprecation") + void happyWithSuperDeprecatedFields() { + // Given a transaction using the super deprecated fields + final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); + final var localTx = Transaction.newBuilder() + .body(txBody) + .sigs(SignatureList.newBuilder().sigs(sig).build()) + .build(); + + // When we check, then we get a PreCheckException with INVALID_TRANSACTION_BODY + assertThatThrownBy(() -> checker.check(localTx, null)) + .isInstanceOf(PreCheckException.class) + .has(responseCode(INVALID_TRANSACTION_BODY)); + + // And the super deprecation counter has been incremented + assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); + // But the deprecation counter has not + assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); + } + + @Test + @DisplayName( + "A transaction with super deprecated fields and signedTransactionBytes ignores super deprecated fields") + @SuppressWarnings("deprecation") + void checkWithSuperDeprecatedFieldsAndSignedTransactionBytes() throws PreCheckException { + // Given a transaction using the super deprecated fields and signedTransactionBytes + final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); + final var localTx = Transaction.newBuilder() + .body(txBody) + .sigs(SignatureList.newBuilder().sigs(sig).build()) + .signedTransactionBytes(asBytes(SignedTransaction.PROTOBUF, signedTx)) + .build(); + + // When we check + final var info = checker.check(localTx, null); + // Then the parsed data is as we expected + assertThat(info.transaction()).isEqualTo(localTx); + assertThat(info.txBody()).isEqualTo(txBody); + assertThat(info.signatureMap()).isEqualTo(signatureMap); + assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); + // And the super-deprecated counter is incremented, but not the deprecated counter + assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); + assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); + } + + @Test + @DisplayName( + "A transaction with super deprecated fields and deprecated fields ignores super deprecated fields") + @SuppressWarnings("deprecation") + void checkWithSuperDeprecatedFieldsAndDeprecatedFields() throws PreCheckException { + // Given a transaction using the super deprecated fields and signedTransactionBytes + final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); + final var localTx = Transaction.newBuilder() + .body(txBody) + .sigs(SignatureList.newBuilder().sigs(sig).build()) + .bodyBytes(asBytes(TransactionBody.PROTOBUF, txBody)) + .sigMap(signatureMap) + .build(); + + // When we check + final var info = checker.check(localTx, null); + // Then the parsed data is as we expected + assertThat(info.transaction()).isEqualTo(localTx); + assertThat(info.txBody()).isEqualTo(txBody); + assertThat(info.signatureMap()).isEqualTo(signatureMap); + assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); + // And the super-deprecated counter is incremented, and also the deprecated counter + assertThat(counterMetric("DeprTxnsRcv").get()).isEqualTo(1); + assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); + } } @Nested diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java index 0a138451b7c4..aa9e897edaf5 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -114,6 +114,7 @@ public TransactionInfo txInfo() { final var signedTx = SignedTransaction.newBuilder().bodyBytes(signedbytes).build(); final var tx = Transaction.newBuilder() + .body(body) .signedTransactionBytes(asBytes(SignedTransaction.PROTOBUF, signedTx)) .build(); return new TransactionInfo(tx, body, SignatureMap.DEFAULT, signedbytes, function, null); diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java index 298933e9941a..70ff7adeec05 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -274,7 +274,12 @@ public class DispatchHandleContextTest extends StateTestBase implements Scenario .consensusSubmitMessage(ConsensusSubmitMessageTransactionBody.DEFAULT) .build(); private static final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().build(), txBody, SignatureMap.DEFAULT, Bytes.EMPTY, CRYPTO_TRANSFER, null); + Transaction.newBuilder().body(txBody).build(), + txBody, + SignatureMap.DEFAULT, + Bytes.EMPTY, + CRYPTO_TRANSFER, + null); private static final TransactionBody MISSING_PAYER_ID = TransactionBody.newBuilder().transactionID(TransactionID.DEFAULT).build(); @@ -747,7 +752,12 @@ private DispatchHandleContext createContext( } final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().build(), txBody, SignatureMap.DEFAULT, Bytes.EMPTY, function, null); + Transaction.newBuilder().body(txBody).build(), + txBody, + SignatureMap.DEFAULT, + Bytes.EMPTY, + function, + null); return new DispatchHandleContext( CONSENSUS_NOW, creatorInfo, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java index c80b07791a53..8433a9f0f139 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -96,7 +96,7 @@ public class RecordFinalizerTest { .build(); private static final TransactionBody TX_BODY = asTxn(TRANSFER_BODY, PAYER_ID, CONSENSUS_NOW); private static final TransactionInfo TXN_INFO = new TransactionInfo( - Transaction.newBuilder().build(), + Transaction.newBuilder().body(TX_BODY).build(), TX_BODY, SignatureMap.DEFAULT, Bytes.EMPTY, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java index 4d1f6c8228ed..f7d049c16412 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -221,7 +221,7 @@ void completeHollowAccountsWithEthereumTransaction() { .ethereumTransaction(EthereumTransactionBody.DEFAULT) .build(); final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().build(), + Transaction.newBuilder().body(txnBody).build(), txnBody, SignatureMap.DEFAULT, transactionBytes, @@ -253,7 +253,7 @@ void ignoreEthereumTransactionIfNoCorrespondingSigs() { .ethereumTransaction(EthereumTransactionBody.DEFAULT) .build(); final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().build(), + Transaction.newBuilder().body(txnBody).build(), txnBody, SignatureMap.DEFAULT, transactionBytes, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java index 8ddb26b8c60a..6879ed150fbb 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java @@ -126,11 +126,13 @@ void setUp() { @Test void testMethodsWithInvalidArguments() { // given - final var txBody = TransactionBody.DEFAULT; + final var txBody = simpleCryptoTransfer().body(); // then assertThatThrownBy(() -> subject.handleTxBody(null, txBody, DEFAULT_CONFIG)) .isInstanceOf(NullPointerException.class); + assertThatThrownBy(() -> subject.handleTxBody(state, txBody, DEFAULT_CONFIG)) + .isInstanceOf(NullPointerException.class); assertThatThrownBy(() -> subject.handleTxBody(state, null, DEFAULT_CONFIG)) .isInstanceOf(NullPointerException.class); } diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java index 747bd5cb1d1b..6eaa0e86074d 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -104,7 +104,7 @@ void setUp() { @Test void testMethodsWithInvalidArguments() { // given - final var txBody = TransactionBody.DEFAULT; + final var txBody = simpleCryptoTransfer().body(); // then assertThatThrownBy(() -> new SystemFileUpdates(null, exchangeRateManager, feeManager, throttleServiceManager)) @@ -119,6 +119,7 @@ void testMethodsWithInvalidArguments() { assertThatThrownBy(() -> subject.handleTxBody(null, txBody)).isInstanceOf(NullPointerException.class); assertThatThrownBy(() -> subject.handleTxBody(state, null)).isInstanceOf(NullPointerException.class); + assertThatThrownBy(() -> subject.handleTxBody(state, txBody)).isInstanceOf(NullPointerException.class); } @Test diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java index f15ad1551362..f49f31cccede 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -134,7 +134,7 @@ void setup() throws PreCheckException { // TODO Mock out the metrics to return objects we can inspect later // Mock out the onset to always return a valid parsed object - transaction = Transaction.newBuilder().build(); + transaction = Transaction.newBuilder().body(transactionBody).build(); when(transactionChecker.parse(requestBuffer)).thenReturn(transaction); final var transactionInfo = new TransactionInfo( transaction, diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java index 4d090c65b73c..467bc9112bf7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,6 +40,7 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HandleSystemContractOperations; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; @@ -189,7 +190,11 @@ void externalizesPreemptedAsExpected() { @Test void externalizeSuccessfulResultWithTransactionBodyTest() { - var transaction = Transaction.newBuilder().build(); + var transaction = Transaction.newBuilder() + .body(TransactionBody.newBuilder() + .transactionID(TransactionID.DEFAULT) + .build()) + .build(); var contractFunctionResult = SystemContractUtils.successResultOfZeroValueTraceable( 0, org.apache.tuweni.bytes.Bytes.EMPTY, diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java index fba925812da2..c862f9d62dc7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,11 @@ import com.hedera.hapi.node.base.QueryHeader; import com.hedera.hapi.node.base.ResponseCodeEnum; +import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallLocalQuery; import com.hedera.hapi.node.transaction.Query; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.infra.HevmStaticTransactionFactory; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.HandleException; @@ -94,7 +97,12 @@ void fromQueryWorkWithSenderAndUsesPriorityAddress() { @Test void fromQueryWorkWithNoSender() { - final var queryHeader = QueryHeader.newBuilder().build(); + final var transactionID = + TransactionID.newBuilder().accountID(SENDER_ID).build(); + final var txBody = + TransactionBody.newBuilder().transactionID(transactionID).build(); + final var payment = Transaction.newBuilder().body(txBody).build(); + final var queryHeader = QueryHeader.newBuilder().payment(payment).build(); given(context.createStore(ReadableAccountStore.class)).willReturn(accountStore); final var query = Query.newBuilder() diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java index 1be4b0b0ac85..3fd3e1834580 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -293,7 +293,7 @@ private TransactionBody givenMintTxn(final TokenID tokenId, final List me .tokenMint(builder.build()) .build(); - final var txn = Transaction.DEFAULT; + final var txn = Transaction.newBuilder().body(txnBody).build(); recordBuilder.transaction(txn); given(handleContext.body()).willReturn(txnBody); From 583a99a68031a726fa7e9fe1d5820a297a1845af Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Tue, 14 Jan 2025 13:35:17 -0800 Subject: [PATCH 07/21] Combine transaction.proto and transaction_body.proto into a single file Signed-off-by: Kim Rader --- .../services/atomic_batch.proto | 44 ++ .../services/state/schedule/schedule.proto | 2 +- .../services/transaction.proto | 530 +++++++++++++++- .../services/transaction_body.proto | 564 ------------------ .../java/com/hedera/hapi/util/HapiUtils.java | 2 +- .../hapi/util/UnknownHederaFunctionality.java | 2 +- .../node/hapi/fixtures/TransactionHelper.java | 4 +- .../app/hapi/utils/CommonPbjConverters.java | 2 +- .../impl/handlers/NodeCreateHandler.java | 2 +- .../impl/handlers/NodeDeleteHandler.java | 2 +- .../impl/handlers/NodeUpdateHandler.java | 2 +- .../test/handlers/NodeCreateHandlerTest.java | 2 +- .../test/handlers/NodeDeleteHandlerTest.java | 2 +- .../test/handlers/NodeUpdateHandlerTest.java | 2 +- .../com/hedera/node/app/spi/AppContext.java | 2 +- .../app/spi/authorization/Authorizer.java | 2 +- .../hedera/node/app/spi/fees/FeeContext.java | 2 +- .../node/app/spi/store/StoreFactory.java | 2 +- .../node/app/spi/throttle/Throttle.java | 2 +- .../app/spi/workflows/DispatchOptions.java | 2 +- .../node/app/spi/workflows/HandleContext.java | 2 +- .../app/spi/workflows/PreHandleContext.java | 2 +- .../node/app/spi/workflows/SystemContext.java | 2 +- .../app/spi/workflows/TransactionHandler.java | 2 +- .../node/app/spi/workflows/WarmupContext.java | 2 +- .../spi/workflows/record/StreamBuilder.java | 2 +- .../app/spi/fixtures/TransactionFactory.java | 2 +- .../workflows/FakePreHandleContext.java | 2 +- .../main/java/com/hedera/node/app/Hedera.java | 2 +- .../app/authorization/AuthorizerImpl.java | 2 +- .../app/authorization/PrivilegesVerifier.java | 2 +- .../app/blocks/impl/BlockStreamBuilder.java | 2 +- .../app/blocks/impl/PairedStreamBuilder.java | 2 +- .../node/app/fees/ChildFeeContextImpl.java | 2 +- .../node/app/fees/FeeCalculatorImpl.java | 2 +- .../hedera/node/app/fees/FeeContextImpl.java | 2 +- .../com/hedera/node/app/fees/FeeManager.java | 2 +- .../congestion/CongestionMultipliers.java | 2 +- .../UtilizationScaledThrottleMultiplier.java | 2 +- .../node/app/services/ServiceScopeLookup.java | 2 +- .../state/logging/TransactionStateLogger.java | 2 +- .../node/app/throttle/AppThrottleFactory.java | 2 +- .../NetworkUtilizationManagerImpl.java | 2 +- .../app/throttle/ThrottleAccumulator.java | 2 +- .../app/throttle/ThrottleServiceManager.java | 2 +- .../node/app/workflows/SolvencyPreCheck.java | 2 +- .../app/workflows/TransactionChecker.java | 2 +- .../node/app/workflows/TransactionInfo.java | 2 +- .../dispatcher/TransactionDispatcher.java | 2 +- .../handle/DispatchHandleContext.java | 2 +- .../workflows/handle/cache/CacheWarmer.java | 2 +- .../handle/dispatch/ChildDispatchFactory.java | 2 +- .../handle/dispatch/RecordFinalizer.java | 2 +- .../handle/record/RecordStreamBuilder.java | 2 +- .../workflows/handle/record/SystemSetup.java | 2 +- .../steps/HollowAccountCompletions.java | 2 +- .../handle/steps/PlatformStateUpdates.java | 2 +- .../handle/steps/SystemFileUpdates.java | 2 +- .../handle/steps/UserTxnFactory.java | 2 +- .../handle/throttle/DispatchUsageManager.java | 2 +- .../workflows/ingest/SubmissionManager.java | 2 +- .../prehandle/PreHandleContextImpl.java | 2 +- .../prehandle/PreHandleWorkflowImpl.java | 2 +- .../workflows/query/QueryWorkflowImpl.java | 2 +- .../standalone/TransactionExecutor.java | 2 +- .../impl/StandaloneDispatchFactory.java | 2 +- .../authorization/PrivilegesVerifierTest.java | 6 +- .../app/blocks/BlockStreamBuilderTest.java | 2 +- .../app/fees/ChildFeeContextImplTest.java | 2 +- .../node/app/fees/FeeCalculatorImplTest.java | 2 +- ...ilizationScaledThrottleMultiplierTest.java | 2 +- .../app/throttle/AppThrottleAdviserTest.java | 2 +- .../app/throttle/AppThrottleFactoryTest.java | 2 +- .../app/throttle/ThrottleAccumulatorTest.java | 2 +- .../NetworkUtilizationManagerImplTest.java | 2 +- .../app/workflows/SolvencyPreCheckTest.java | 2 +- .../app/workflows/TransactionCheckerTest.java | 2 +- .../workflows/TransactionScenarioBuilder.java | 2 +- .../handle/DispatchHandleContextTest.java | 2 +- .../handle/DispatchProcessorTest.java | 2 +- .../dispatch/ChildDispatchFactoryTest.java | 2 +- .../handle/dispatch/RecordFinalizerTest.java | 2 +- .../dispatch/ValidationReporterTest.java | 2 +- .../handle/record/RecordTestData.java | 2 +- .../steps/HollowAccountCompletionsTest.java | 2 +- .../steps/PlatformStateUpdatesTest.java | 2 +- .../handle/steps/SystemFileUpdatesTest.java | 2 +- .../workflows/handle/steps/UserTxnTest.java | 2 +- .../throttle/DispatchUsageManagerTest.java | 2 +- .../workflows/ingest/IngestCheckerTest.java | 2 +- .../ingest/IngestWorkflowImplTest.java | 2 +- .../ingest/SubmissionManagerTest.java | 2 +- .../prehandle/PreHandleContextImplTest.java | 2 +- .../PreHandleContextListUpdatesTest.java | 2 +- .../app/workflows/query/QueryCheckerTest.java | 2 +- .../query/QueryWorkflowImplTest.java | 2 +- .../standalone/TransactionExecutorsTest.java | 2 +- .../handlers/ConsensusCreateTopicHandler.java | 2 +- .../handlers/ConsensusDeleteTopicHandler.java | 2 +- .../ConsensusSubmitMessageHandler.java | 2 +- .../handlers/ConsensusUpdateTopicHandler.java | 2 +- .../handlers/ConsensusCreateTopicTest.java | 2 +- .../handlers/ConsensusDeleteTopicTest.java | 2 +- .../ConsensusSubmitMessageHandlerTest.java | 2 +- .../ConsensusUpdateTopicHandlerTest.java | 2 +- .../file/impl/handlers/FileAppendHandler.java | 2 +- .../file/impl/handlers/FileCreateHandler.java | 2 +- .../file/impl/handlers/FileDeleteHandler.java | 2 +- .../handlers/FileSignatureWaiversImpl.java | 2 +- .../handlers/FileSystemDeleteHandler.java | 2 +- .../handlers/FileSystemUndeleteHandler.java | 2 +- .../file/impl/handlers/FileUpdateHandler.java | 2 +- .../file/impl/schemas/V0490FileSchema.java | 2 +- .../test/handlers/FileAppendHandlerTest.java | 2 +- .../impl/test/handlers/FileCreateTest.java | 2 +- .../impl/test/handlers/FileDeleteTest.java | 2 +- .../FileSignatureWaiversImplTest.java | 2 +- .../test/handlers/FileSystemDeleteTest.java | 2 +- .../test/handlers/FileSystemUndeleteTest.java | 2 +- .../impl/test/handlers/FileUpdateTest.java | 2 +- .../service/file/FileSignatureWaivers.java | 2 +- .../impl/handlers/FreezeHandler.java | 2 +- .../NetworkUncheckedSubmitHandler.java | 2 +- .../impl/test/handlers/FreezeHandlerTest.java | 2 +- .../handlers/AbstractScheduleHandler.java | 2 +- .../impl/handlers/HandlerUtility.java | 2 +- .../impl/handlers/ScheduleCreateHandler.java | 2 +- .../impl/handlers/ScheduleDeleteHandler.java | 2 +- .../impl/handlers/ScheduleSignHandler.java | 2 +- .../schedule/impl/ScheduleTestBase.java | 2 +- .../impl/ScheduledTransactionFactory.java | 2 +- .../impl/handlers/HandlerUtilityTest.java | 2 +- .../handlers/ScheduleCreateHandlerTest.java | 2 +- .../handlers/ScheduleDeleteHandlerTest.java | 2 +- .../handlers/ScheduleSignHandlerTest.java | 2 +- .../app/service/schedule/ExecutableTxn.java | 2 +- .../impl/exec/gas/DispatchGasCalculator.java | 2 +- .../exec/gas/SystemContractGasCalculator.java | 2 +- .../scope/HandleHederaNativeOperations.java | 2 +- .../exec/scope/HandleHederaOperations.java | 2 +- .../scope/HandleSystemContractOperations.java | 2 +- .../scope/QuerySystemContractOperations.java | 2 +- .../exec/scope/SystemContractOperations.java | 2 +- .../systemcontracts/PrngSystemContract.java | 2 +- .../has/hbarapprove/HbarApproveCall.java | 2 +- .../hbarapprove/HbarApproveTranslator.java | 2 +- .../SetUnlimitedAutoAssociationsCall.java | 2 +- ...etUnlimitedAutoAssociationsTranslator.java | 2 +- .../hss/DispatchForResponseCodeHssCall.java | 2 +- .../schedulenative/ScheduleNativeCall.java | 2 +- .../ScheduleNativeTranslator.java | 2 +- .../signschedule/SignScheduleTranslator.java | 2 +- .../hts/AddressIdConverter.java | 4 +- .../hts/DispatchForResponseCodeHtsCall.java | 2 +- .../hts/airdrops/TokenAirdropDecoder.java | 2 +- .../hts/airdrops/TokenAirdropTranslator.java | 2 +- .../hts/associations/AssociationsDecoder.java | 2 +- .../associations/AssociationsTranslator.java | 2 +- .../systemcontracts/hts/burn/BurnDecoder.java | 2 +- .../hts/burn/BurnTranslator.java | 2 +- .../TokenCancelAirdropDecoder.java | 2 +- .../TokenCancelAirdropTranslator.java | 2 +- .../TokenClaimAirdropDecoder.java | 2 +- .../TokenClaimAirdropTranslator.java | 2 +- .../hts/create/ClassicCreatesCall.java | 2 +- .../hts/create/CreateDecoder.java | 2 +- .../hts/create/CreateDecoderFunction.java | 2 +- .../hts/create/CreateTranslator.java | 2 +- .../hts/delete/DeleteTranslator.java | 2 +- .../hts/freeze/FreezeUnfreezeDecoder.java | 2 +- .../hts/freeze/FreezeUnfreezeTranslator.java | 2 +- .../AbstractGrantApprovalCall.java | 2 +- .../grantapproval/GrantApprovalDecoder.java | 2 +- .../GrantApprovalTranslator.java | 2 +- .../grantrevokekyc/GrantRevokeKycDecoder.java | 2 +- .../GrantRevokeKycTranslator.java | 2 +- .../systemcontracts/hts/mint/MintDecoder.java | 2 +- .../hts/mint/MintTranslator.java | 2 +- .../hts/pauses/PausesDecoder.java | 2 +- .../hts/pauses/PausesTranslator.java | 2 +- .../hts/rejecttokens/RejectTokensDecoder.java | 2 +- .../rejecttokens/RejectTokensTranslator.java | 2 +- .../setapproval/SetApprovalForAllCall.java | 2 +- .../setapproval/SetApprovalForAllDecoder.java | 2 +- .../SetApprovalForAllTranslator.java | 2 +- .../hts/transfer/ClassicTransfersCall.java | 2 +- .../hts/transfer/ClassicTransfersDecoder.java | 2 +- .../transfer/ClassicTransfersTranslator.java | 2 +- .../hts/transfer/Erc20TransfersCall.java | 2 +- .../hts/transfer/Erc721TransferFromCall.java | 2 +- .../hts/update/UpdateDecoder.java | 2 +- .../hts/update/UpdateDecoderFunction.java | 2 +- .../hts/update/UpdateExpiryTranslator.java | 2 +- .../hts/update/UpdateKeysTranslator.java | 2 +- .../update/UpdateNFTsMetadataTranslator.java | 2 +- .../hts/update/UpdateTranslator.java | 2 +- .../UpdateTokenCustomFeesDecoder.java | 2 +- .../UpdateTokenCustomFeesTranslator.java | 2 +- .../systemcontracts/hts/wipe/WipeDecoder.java | 2 +- .../hts/wipe/WipeTranslator.java | 2 +- .../impl/exec/utils/SchedulingUtility.java | 2 +- .../AbstractContractTransactionHandler.java | 2 +- .../impl/handlers/ContractCallHandler.java | 2 +- .../impl/handlers/ContractCreateHandler.java | 2 +- .../impl/handlers/ContractDeleteHandler.java | 2 +- .../handlers/ContractSystemDeleteHandler.java | 2 +- .../ContractSystemUndeleteHandler.java | 2 +- .../impl/handlers/ContractUpdateHandler.java | 2 +- .../handlers/EthereumTransactionHandler.java | 2 +- .../impl/infra/HevmTransactionFactory.java | 2 +- .../contract/impl/test/TestHelpers.java | 2 +- .../exec/ContextTransactionProcessorTest.java | 2 +- .../impl/test/exec/QueryModuleTest.java | 2 +- .../impl/test/exec/TransactionModuleTest.java | 2 +- .../gas/SystemContractGasCalculatorTest.java | 2 +- .../HandleHederaNativeOperationsTest.java | 2 +- .../scope/HandleHederaOperationsTest.java | 2 +- .../HandleSystemContractOperationsTest.java | 2 +- .../QuerySystemContractOperationsTest.java | 2 +- .../has/hbarApprove/HbarApproveCallTest.java | 2 +- .../SetUnlimitedAutoAssociationsCallTest.java | 2 +- .../DispatchForResponseCodeHssCallTest.java | 2 +- .../ScheduleNativeTranslatorTest.java | 2 +- .../SignScheduleTranslatorTest.java | 2 +- .../DispatchForResponseCodeHtsCallTest.java | 2 +- .../hts/HtsCallAttemptTest.java | 2 +- .../airdrops/TokenAirdropTranslatorTest.java | 2 +- .../associations/AssociationsDecoderTest.java | 2 +- .../AssociationsTranslatorTest.java | 2 +- .../TokenCancelAirdropTranslatorTest.java | 2 +- .../TokenClaimAirdropTranslatorTest.java | 2 +- .../hts/create/ClassicCreatesCallTest.java | 2 +- .../hts/create/CreateDecoderTest.java | 2 +- .../hts/freeze/FreezeUnfreezeDecoderTest.java | 2 +- .../ERCGrantApprovalCallTest.java | 2 +- .../GrantApprovalDecoderTest.java | 2 +- .../GrantRevokeKycDecoderTest.java | 2 +- .../hts/pauses/PausesDecoderTest.java | 2 +- .../RejectTokensTranslatorTest.java | 2 +- .../SetApprovalForAllCallTest.java | 2 +- .../SetApprovalForAllDecoderTest.java | 2 +- .../transfer/ClassicTransfersCallTest.java | 2 +- .../transfer/ClassicTransfersDecoderTest.java | 2 +- .../transfer/ClassicTransfersGasCalcTest.java | 2 +- .../hts/transfer/Erc20TransfersCallTest.java | 2 +- .../transfer/Erc721TransferFromCallTest.java | 2 +- .../hts/update/UpdateTranslatorTest.java | 2 +- .../handlers/ContractCallHandlerTest.java | 2 +- .../handlers/ContractCreateHandlerTest.java | 2 +- .../handlers/ContractDeleteHandlerTest.java | 2 +- .../handlers/ContractUpdateHandlerTest.java | 2 +- .../EthereumTransactionHandlerTest.java | 2 +- .../HevmStaticTransactionFactoryTest.java | 2 +- .../infra/HevmTransactionFactoryTest.java | 2 +- .../impl/CryptoSignatureWaiversImpl.java | 2 +- .../handlers/CryptoAddLiveHashHandler.java | 2 +- .../CryptoApproveAllowanceHandler.java | 2 +- .../impl/handlers/CryptoCreateHandler.java | 2 +- .../CryptoDeleteAllowanceHandler.java | 2 +- .../impl/handlers/CryptoDeleteHandler.java | 2 +- .../handlers/CryptoDeleteLiveHashHandler.java | 2 +- .../impl/handlers/CryptoTransferHandler.java | 2 +- .../impl/handlers/CryptoUpdateHandler.java | 2 +- .../handlers/TokenAccountWipeHandler.java | 2 +- .../impl/handlers/TokenAirdropHandler.java | 2 +- .../TokenAssociateToAccountHandler.java | 2 +- .../token/impl/handlers/TokenBurnHandler.java | 2 +- .../handlers/TokenCancelAirdropHandler.java | 2 +- .../handlers/TokenClaimAirdropHandler.java | 2 +- .../impl/handlers/TokenCreateHandler.java | 2 +- .../impl/handlers/TokenDeleteHandler.java | 2 +- .../TokenDissociateFromAccountHandler.java | 2 +- .../TokenFeeScheduleUpdateHandler.java | 2 +- .../handlers/TokenFreezeAccountHandler.java | 2 +- .../TokenGrantKycToAccountHandler.java | 2 +- .../token/impl/handlers/TokenMintHandler.java | 2 +- .../impl/handlers/TokenPauseHandler.java | 2 +- .../impl/handlers/TokenRejectHandler.java | 2 +- .../TokenRevokeKycFromAccountHandler.java | 2 +- .../handlers/TokenUnfreezeAccountHandler.java | 2 +- .../impl/handlers/TokenUnpauseHandler.java | 2 +- .../impl/handlers/TokenUpdateHandler.java | 2 +- .../impl/handlers/TokenUpdateNftsHandler.java | 2 +- .../staking/EndOfStakingPeriodUtils.java | 2 +- .../AssociateTokenRecipientsStep.java | 2 +- .../handlers/transfer/AutoAccountCreator.java | 2 +- .../handlers/transfer/TransferExecutor.java | 2 +- .../test/CryptoSignatureWaiversImplTest.java | 2 +- .../CryptoAddLiveHashHandlerTest.java | 2 +- .../CryptoApproveAllowanceHandlerTest.java | 2 +- .../handlers/CryptoCreateHandlerTest.java | 2 +- .../CryptoDeleteAllowanceHandlerTest.java | 2 +- .../handlers/CryptoDeleteHandlerTest.java | 2 +- .../CryptoTransferHandlerPureChecksTest.java | 2 +- .../handlers/CryptoTransferHandlerTest.java | 2 +- .../CryptoTransferHandlerTestBase.java | 2 +- .../handlers/CryptoUpdateHandlerTest.java | 2 +- .../handlers/TokenAccountWipeHandlerTest.java | 2 +- .../handlers/TokenAirdropHandlerTest.java | 2 +- .../TokenAssociateToAccountHandlerTest.java | 2 +- .../test/handlers/TokenBurnHandlerTest.java | 2 +- ...kenCancelAirdropHandlerPureChecksTest.java | 2 +- .../TokenCancelAirdropHandlerTest.java | 2 +- .../test/handlers/TokenCreateHandlerTest.java | 4 +- .../test/handlers/TokenDeleteHandlerTest.java | 2 +- ...TokenDissociateFromAccountHandlerTest.java | 2 +- .../TokenFeeScheduleUpdateHandlerTest.java | 2 +- .../TokenFreezeAccountHandlerTest.java | 2 +- .../TokenGrantKycToAccountHandlerTest.java | 2 +- .../test/handlers/TokenMintHandlerTest.java | 2 +- .../test/handlers/TokenPauseHandlerTest.java | 2 +- .../test/handlers/TokenRejectHandlerTest.java | 2 +- .../TokenRevokeKycFromAccountHandlerTest.java | 2 +- .../TokenUnfreezeAccountHandlerTest.java | 2 +- .../handlers/TokenUnpauseHandlerTest.java | 2 +- .../test/handlers/TokenUpdateHandlerTest.java | 4 +- .../handlers/TokenUpdateNftsHandlerTest.java | 2 +- .../EndOfStakingPeriodUpdaterTest.java | 2 +- .../handlers/staking/StakeInfoHelperTest.java | 2 +- .../test/handlers/transfer/StepsBase.java | 2 +- .../ApproveAllowanceValidatorTest.java | 2 +- .../DeleteAllowanceValidatorTest.java | 2 +- .../service/token/CryptoSignatureWaivers.java | 2 +- .../service/token/api/TokenServiceApi.java | 2 +- .../util/impl/handlers/UtilPrngHandler.java | 2 +- .../test/handlers/UtilPrngHandlerTest.java | 2 +- .../inputs/BlockTransactionParts.java | 2 +- .../translators/inputs/TransactionParts.java | 2 +- .../block/BlockItemNonceValidator.java | 2 +- .../bdd/spec/transactions/TxnFactory.java | 12 +- .../bdd/spec/utilops/EmbeddedVerbs.java | 2 +- .../services/bdd/spec/utilops/UtilVerbs.java | 2 +- 332 files changed, 910 insertions(+), 908 deletions(-) create mode 100644 hapi/hedera-protobufs/services/atomic_batch.proto delete mode 100644 hapi/hedera-protobufs/services/transaction_body.proto diff --git a/hapi/hedera-protobufs/services/atomic_batch.proto b/hapi/hedera-protobufs/services/atomic_batch.proto new file mode 100644 index 000000000000..74eed67eeacc --- /dev/null +++ b/hapi/hedera-protobufs/services/atomic_batch.proto @@ -0,0 +1,44 @@ +/** + * # Atomic Batch + * A transaction that groups multiple transactions together, and executes + * them atomically. + * + * ### 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; + +/* + * Copyright (C) 2018-2024 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +option java_package = "com.hederahashgraph.api.proto.java"; +// <<>> This comment is special code for setting PBJ Compiler java package +option java_multiple_files = true; + +import "transaction.proto"; + +/** + * Create an atomic batch. + */ +message AtomicBatchTransactionBody { + repeated Transaction transactions = 1; +} diff --git a/hapi/hedera-protobufs/services/state/schedule/schedule.proto b/hapi/hedera-protobufs/services/state/schedule/schedule.proto index 904a50dac44f..724dda6bfa25 100644 --- a/hapi/hedera-protobufs/services/state/schedule/schedule.proto +++ b/hapi/hedera-protobufs/services/state/schedule/schedule.proto @@ -31,7 +31,7 @@ package proto; import "basic_types.proto"; import "timestamp.proto"; import "schedulable_transaction_body.proto"; -import "transaction_body.proto"; +import "transaction.proto"; option java_package = "com.hederahashgraph.api.proto.java"; // <<>> This comment is special code for setting PBJ Compiler java package diff --git a/hapi/hedera-protobufs/services/transaction.proto b/hapi/hedera-protobufs/services/transaction.proto index c00e92ca7763..88c5b43d04d8 100644 --- a/hapi/hedera-protobufs/services/transaction.proto +++ b/hapi/hedera-protobufs/services/transaction.proto @@ -35,6 +35,73 @@ option java_package = "com.hederahashgraph.api.proto.java"; option java_multiple_files = true; import "basic_types.proto"; +import "system_delete.proto"; +import "system_undelete.proto"; +import "freeze.proto"; + +import "contract_call.proto"; +import "contract_create.proto"; +import "contract_update.proto"; + +import "crypto_add_live_hash.proto"; +import "crypto_create.proto"; +import "crypto_delete.proto"; +import "crypto_delete_live_hash.proto"; +import "crypto_transfer.proto"; +import "crypto_update.proto"; +import "crypto_approve_allowance.proto"; +import "crypto_delete_allowance.proto"; + +import "ethereum_transaction.proto"; + +import "file_append.proto"; +import "file_create.proto"; +import "file_delete.proto"; +import "file_update.proto"; + +import "duration.proto"; +import "contract_delete.proto"; + +import "consensus_create_topic.proto"; +import "consensus_update_topic.proto"; +import "consensus_delete_topic.proto"; +import "consensus_submit_message.proto"; + +import "unchecked_submit.proto"; + +import "token_create.proto"; +import "token_freeze_account.proto"; +import "token_unfreeze_account.proto"; +import "token_grant_kyc.proto"; +import "token_revoke_kyc.proto"; +import "token_delete.proto"; +import "token_update.proto"; +import "token_mint.proto"; +import "token_burn.proto"; +import "token_wipe_account.proto"; +import "token_associate.proto"; +import "token_dissociate.proto"; +import "token_fee_schedule_update.proto"; +import "token_pause.proto"; +import "token_unpause.proto"; +import "token_update_nfts.proto"; +import "token_reject.proto"; +import "token_airdrop.proto"; +import "token_cancel_airdrop.proto"; +import "token_claim_airdrop.proto"; + +import "schedule_create.proto"; +import "schedule_delete.proto"; +import "schedule_sign.proto"; + +import "node_stake_update.proto"; +import "util_prng.proto"; + +import "node_create.proto"; +import "node_update.proto"; +import "node_delete.proto"; + +import "event/state_signature_transaction.proto"; /** * A wrapper around signed transaction bytes.
@@ -51,13 +118,10 @@ import "basic_types.proto"; */ message Transaction { /** - * TransactionBody body = 1 [deprecated = true]; * Replaced with `signedTransactionBytes`.
* The body of the transaction. */ - // FUTURE - Uncomment when https://github.com/hashgraph/pbj/issues/339 is fixed; - // currently the PBJ-generated unit tests fail when using reserved ordinals -// reserved 1; + TransactionBody body = 1 [deprecated = true]; /** * Replaced with `signedTransactionBytes`.
@@ -86,3 +150,461 @@ message Transaction { */ bytes signedTransactionBytes = 5; } + +/** + * A transaction body. + * + * Every transaction is structured as a signed byte array. That byte array + * is a serialized `TransactionBody`. The transaction body contains the full + * content of the transaction, while the `SignedTransaction` includes a + * signature map for signatures authenticating that byte array, and that is + * serialized and transmitted wrapped in a `Transaction` message.
+ * The bulk of this message is a `oneof` block which offers the option for + * any one of the transaction messages for the network. + * This message also includes several additional fields to specify + * various parameters required to process a transaction. + */ +message TransactionBody { + reserved 30, 61, 62, 63, 64; + + reserved "tssMessage", "tssVote", "tssShareSignature", "tssEncryptionKey"; + + /** + * A transaction identifier.
+ * Each transaction is uniquely identified by its transaction + * identifier. + *

+ * Each transaction identifier MUST be unique.
+ * Multiple transactions MAY be submitted with the same transaction + * identifier, but all except the first SHALL be rejected as duplicate + * transactions.
+ * This identifier MUST specify a `payer` account to be charged + * all fees associated with the transaction.
+ * This identifier MUST specify a "valid start time".
+ * The "valid start time" MUST be strictly _earlier_ than the current + * network consensus time.
+ * The "valid start time" MUST NOT be more than the current network + * configuration value for `transaction.maxValidDuration` seconds + * before the current network consensus time.
+ * This identifier MUST NOT set the `scheduled` flag.
+ * This identifier MUST NOT set a nonce value. + */ + TransactionID transactionID = 1; + + /** + * A node account identifier. + *

+ * This MUST identify the account of the consensus node to which + * this transaction is submitted. + */ + AccountID nodeAccountID = 2; + + /** + * A maximum transaction fee, in tinybar. + *

+ * The network SHALL NOT charge a transaction fee that exceeds this + * amount.
+ * The network MAY charge up to this amount, and reject the transaction, + * if the amount offered is insufficient to cover the required fees.
+ * The network MAY charge a minimum fee equal to 80% of the amount offered + * if the amount offered is much larger than the required fees. + */ + uint64 transactionFee = 3; + + /** + * A maximum duration in which to execute this transaction. + *

+ * This transaction SHALL be rejected as expired if the valid start time, + * extended by this duration, is less than the current network consensus + * time when the transaction is submitted.
+ * This transaction SHALL be rejected with an invalid duration if this + * value is greater than the current network configuration value for + * `transaction.maxValidDuration`. + */ + Duration transactionValidDuration = 4; + + /** + * Records are always generated.
+ * Obsolete option to not generate a record. + *

+ * This flag SHALL be ignored. Every transaction SHALL generate a record, + * or block stream equivalent. + */ + bool generateRecord = 5 [deprecated = true]; + + /** + * A short description for this transaction. + *

+ * This value, if set, MUST NOT exceed `transaction.maxMemoUtf8Bytes` + * (default 100) bytes when encoded as UTF-8. + */ + string memo = 6; + + // The fields here are ordered in strictly ascending field ordinal + // order due to limitations in PBJ. + oneof data { + /** + * Call a function defined on a smart contract. + */ + ContractCallTransactionBody contractCall = 7; + + /** + * Create a smart contract. + */ + ContractCreateTransactionBody contractCreateInstance = 8; + + /** + * Update a smart contract. + */ + ContractUpdateTransactionBody contractUpdateInstance = 9; + + /** + * An obsolete, and unsupported, operation to add a "live hash" to + * an account. + */ + CryptoAddLiveHashTransactionBody cryptoAddLiveHash = 10 [deprecated = true]; + + /** + * Create a new Hedera account. + */ + CryptoCreateTransactionBody cryptoCreateAccount = 11; + + /** + * Delete an Hedera account.
+ * This will mark the account as deleted, and transfer all remaining + * HBAR to a receiver account. + */ + CryptoDeleteTransactionBody cryptoDelete = 12; + + /** + * An obsolete, and unsupported, operation to remove a "live hash" from + * an account. + */ + CryptoDeleteLiveHashTransactionBody cryptoDeleteLiveHash = 13 [deprecated = true]; + + /** + * Transfer HBAR between accounts. + */ + CryptoTransferTransactionBody cryptoTransfer = 14; + + /** + * Modify an Hedera account. + */ + CryptoUpdateTransactionBody cryptoUpdateAccount = 15; + + /** + * Append data to the end of a file. + */ + FileAppendTransactionBody fileAppend = 16; + + /** + * Create a new file. + */ + FileCreateTransactionBody fileCreate = 17; + + /** + * Delete a file.
+ * This will remove the content of the file, and mark the file as + * deleted. + */ + FileDeleteTransactionBody fileDelete = 18; + + /** + * Modify a file.
+ * This may modify any metadata, and/or _replace_ the content. + */ + FileUpdateTransactionBody fileUpdate = 19; + + /** + * Delete a file as an Hedera administrative function.
+ * This is a privileged operation. + */ + SystemDeleteTransactionBody systemDelete = 20; + + /** + * Restore a file deleted via `systemDelete`.
+ * This is a privileged operation. + */ + SystemUndeleteTransactionBody systemUndelete = 21; + + /** + * Delete a smart contract and transfer remaining balance + * to a specified account. + */ + ContractDeleteTransactionBody contractDeleteInstance = 22; + + /** + * Freeze the network.
+ * This is actually several possible operations, and the caller + * should examine the "freeze service" for more detail.
+ * This is a privileged operation. + */ + FreezeTransactionBody freeze = 23; + + /** + * Create a topic. + */ + ConsensusCreateTopicTransactionBody consensusCreateTopic = 24; + + /** + * Update a topic. + */ + ConsensusUpdateTopicTransactionBody consensusUpdateTopic = 25; + + /** + * Delete a topic. + */ + ConsensusDeleteTopicTransactionBody consensusDeleteTopic = 26; + + /** + * Submit a message to a topic.
+ * A message may be "chunked", and submitted in parts, if the total + * message size exceeds the limit for a single transaction. + */ + ConsensusSubmitMessageTransactionBody consensusSubmitMessage = 27; + + /** + * Unsupported system transaction. + *

+ * This transaction MAY be implemented in testing networks, but + * SHALL NOT be enabled or supported in production environments.
+ * Clients MUST NOT call this method, and any such transaction SHALL + * be rejected.
+ * A network MAY choose to charge punitive fees for attempting to + * execute an `uncheckedSubmit`. + */ + UncheckedSubmitBody uncheckedSubmit = 28; + + /** + * Create a new Hedera token. + */ + TokenCreateTransactionBody tokenCreation = 29; + + /** + * Freeze an account with respect to a token.
+ * A frozen account cannot transact in that token until unfrozen. + */ + TokenFreezeAccountTransactionBody tokenFreeze = 31; + + /** + * Unfreeze an account with respect to a token. + */ + TokenUnfreezeAccountTransactionBody tokenUnfreeze = 32; + + /** + * Grant KYC to an account with respect to a token.
+ * KYC is generally a "know your customer" assertion that a + * responsible entity has sufficient information to positively + * identify the account holder to relevant authorities. + */ + TokenGrantKycTransactionBody tokenGrantKyc = 33; + + /** + * Revoke KYC from an account with respect to a token. + */ + TokenRevokeKycTransactionBody tokenRevokeKyc = 34; + + /** + * Delete an Hedera token.
+ * The token will be marked deleted. + */ + TokenDeleteTransactionBody tokenDeletion = 35; + + /** + * Update an Hedera token.
+ * Depending on what fields are to be modified, the signature + * requirements will vary. See `TokenUpdateTransactionBody` for + * further detail. + */ + TokenUpdateTransactionBody tokenUpdate = 36; + + /** + * Mint new tokens.
+ * All minted tokens will be delivered to the treasury account for + * the token type. The "mint key" for the token must sign this + * transaction. + */ + TokenMintTransactionBody tokenMint = 37; + + /** + * Burn tokens from the treasury account.
+ * The "burn key" for the token must sign this transaction. + */ + TokenBurnTransactionBody tokenBurn = 38; + + /** + * Wipe tokens from an account.
+ * This will remove a specified amount of fungible/common tokens or + * a specified list of non-fungible/unique serial numbered tokens + * of a given token type from an Hedera account. The removed tokens + * are _burned_ as if by a `tokenBurn` transaction.
+ * The "wipe key" for the token must sign this transaction. + */ + TokenWipeAccountTransactionBody tokenWipe = 39; + + /** + * Associate tokens to an account. + */ + TokenAssociateTransactionBody tokenAssociate = 40; + + /** + * Dissociate tokens from an account. + */ + TokenDissociateTransactionBody tokenDissociate = 41; + + /** + * Create a schedule.
+ * A schedule is a request to execute a specific transaction, included + * in the create body, in the future. The scheduled transaction may + * execute as soon as all signature requirements are met with the + * schedule create or a subsequent schedule sign transaction. + * A schedule may, alternatively, execute on expiration if + * long-term schedules are enabled and the schedule meets signature + * requirements at that time. + */ + ScheduleCreateTransactionBody scheduleCreate = 42; + + /** + * Delete a schedule.
+ * The schedule will be marked as deleted. + */ + ScheduleDeleteTransactionBody scheduleDelete = 43; + + /** + * Sign a schedule.
+ * Add one or more cryptographic keys to the list of keys that have + * signed a schedule, and which may serve to meet the signature + * requirements for the scheduled transaction. + */ + ScheduleSignTransactionBody scheduleSign = 44; + + /** + * Update the custom fee schedule for a token.
+ * This transaction must be signed by the "fee schedule key" + * for the token. + */ + TokenFeeScheduleUpdateTransactionBody token_fee_schedule_update = 45; + + /** + * Pause a Token. + *

+ * This transaction MUST be signed by the "pause key" for the token. + */ + TokenPauseTransactionBody token_pause = 46; + + /** + * Unpause a Token. + *

+ * This transaction MUST be signed by the "pause key" for the token. + */ + TokenUnpauseTransactionBody token_unpause = 47; + + /** + * Add one or more approved allowances for spenders to transfer the + * paying account's hbar or tokens. + */ + CryptoApproveAllowanceTransactionBody cryptoApproveAllowance = 48; + + /** + * Delete one or more approvals for spenders to transfer the + * paying account's hbar or tokens. + */ + CryptoDeleteAllowanceTransactionBody cryptoDeleteAllowance = 49; + + /** + * Perform an Ethereum encoded transaction. + */ + EthereumTransactionBody ethereumTransaction = 50; + + /** + * Update the staking information.
+ * This internal transaction is performed at the end of a staking + * period to complete staking calculations and indicate that new + * staking period has started. + */ + NodeStakeUpdateTransactionBody node_stake_update = 51; + + /** + * Provide a deterministic pseudorandom number based on network state. + */ + UtilPrngTransactionBody util_prng = 52; + + /** + * Update one or more non-fungible/unique tokens.
+ * This will update metadata for one or more serial numbers within + * a collection (token type). + */ + TokenUpdateNftsTransactionBody token_update_nfts = 53; + + /** + * Create a new node in the network address book.
+ * This is a privileged operation. + *

+ * This transaction SHALL create a new consensus node record and add + * that record to the network address book. + */ + com.hedera.hapi.node.addressbook.NodeCreateTransactionBody nodeCreate = 54; + + /** + * Update a node in the network address book.
+ * This is a privileged operation. + *

+ * This transaction SHALL update an existing consensus node record in + * the network address book. + */ + com.hedera.hapi.node.addressbook.NodeUpdateTransactionBody nodeUpdate = 55; + + /** + * Delete a node from the network address book.
+ * This is a privileged operation. + *

+ * This transaction SHALL mark an existing consensus node record as + * deleted and remove that node from the network address book. + */ + com.hedera.hapi.node.addressbook.NodeDeleteTransactionBody nodeDelete = 56; + + /** + * Reject and return a token to treasury.
+ * This transaction will transfer one or more tokens or token + * balances held by the requesting account to the treasury + * for each token type. + *

+ * Each transfer MUST be one of the following: + *

    + *
  • A single non-fungible/unique token.
    • + *
  • The full balance held for a fungible/common + * token type.
    • + *
+ * When complete, the requesting account SHALL NOT hold the + * rejected tokens.
+ * Custom fees and royalties defined for the tokens rejected + * SHALL NOT be charged for this transaction. + */ + TokenRejectTransactionBody tokenReject = 57; + + /** + * "Airdrop" tokens.
+ * This transaction sends tokens from one or more "sender" accounts + * to one or more "recipient" accounts. + *

+ * If a recipient account cannot immediately receive the token(s) sent, + * a "pending" airdrop SHALL be created and MUST be claimed. + */ + TokenAirdropTransactionBody tokenAirdrop = 58; + + /** + * Cancel one or more "pending" airdrops that are not yet claimed. + */ + TokenCancelAirdropTransactionBody tokenCancelAirdrop = 59; + + /** + * Claim one or more "pending" airdrops. + */ + TokenClaimAirdropTransactionBody tokenClaimAirdrop = 60; + + /** + * A transaction body for signature of a state root hash gossiped to other nodes + */ + com.hedera.hapi.platform.event.StateSignatureTransaction state_signature_transaction = 65; + } +} diff --git a/hapi/hedera-protobufs/services/transaction_body.proto b/hapi/hedera-protobufs/services/transaction_body.proto deleted file mode 100644 index b41e58563849..000000000000 --- a/hapi/hedera-protobufs/services/transaction_body.proto +++ /dev/null @@ -1,564 +0,0 @@ -/** - * # Transaction Body - * The body of a transaction, this message is serialized and signed. - * - * All of the entries in the `data` `oneof` are fully specified elsewhere; - * we only include a short summary here. - * - * ### 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; - -/* - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -option java_package = "com.hederahashgraph.api.proto.java"; -// <<>> This comment is special code for setting PBJ Compiler java package -option java_multiple_files = true; - -import "system_delete.proto"; -import "system_undelete.proto"; -import "freeze.proto"; - -import "contract_call.proto"; -import "contract_create.proto"; -import "contract_update.proto"; - -import "crypto_add_live_hash.proto"; -import "crypto_create.proto"; -import "crypto_delete.proto"; -import "crypto_delete_live_hash.proto"; -import "crypto_transfer.proto"; -import "crypto_update.proto"; -import "crypto_approve_allowance.proto"; -import "crypto_delete_allowance.proto"; - -import "ethereum_transaction.proto"; - -import "file_append.proto"; -import "file_create.proto"; -import "file_delete.proto"; -import "file_update.proto"; - -import "duration.proto"; -import "basic_types.proto"; -import "contract_delete.proto"; - -import "consensus_create_topic.proto"; -import "consensus_update_topic.proto"; -import "consensus_delete_topic.proto"; -import "consensus_submit_message.proto"; - -import "unchecked_submit.proto"; - -import "token_create.proto"; -import "token_freeze_account.proto"; -import "token_unfreeze_account.proto"; -import "token_grant_kyc.proto"; -import "token_revoke_kyc.proto"; -import "token_delete.proto"; -import "token_update.proto"; -import "token_mint.proto"; -import "token_burn.proto"; -import "token_wipe_account.proto"; -import "token_associate.proto"; -import "token_dissociate.proto"; -import "token_fee_schedule_update.proto"; -import "token_pause.proto"; -import "token_unpause.proto"; -import "token_update_nfts.proto"; -import "token_reject.proto"; -import "token_airdrop.proto"; -import "token_cancel_airdrop.proto"; -import "token_claim_airdrop.proto"; - -import "schedule_create.proto"; -import "schedule_delete.proto"; -import "schedule_sign.proto"; - -import "node_stake_update.proto"; -import "util_prng.proto"; - -import "node_create.proto"; -import "node_update.proto"; -import "node_delete.proto"; - -import "event/state_signature_transaction.proto"; - -/** - * A transaction body. - * - * Every transaction is structured as a signed byte array. That byte array - * is a serialized `TransactionBody`. The transaction body contains the full - * content of the transaction, while the `SignedTransaction` includes a - * signature map for signatures authenticating that byte array, and that is - * serialized and transmitted wrapped in a `Transaction` message.
- * The bulk of this message is a `oneof` block which offers the option for - * any one of the transaction messages for the network. - * This message also includes several additional fields to specify - * various parameters required to process a transaction. - */ -message TransactionBody { - reserved 30, 61, 62, 63, 64; - - reserved "tssMessage", "tssVote", "tssShareSignature", "tssEncryptionKey"; - - /** - * A transaction identifier.
- * Each transaction is uniquely identified by its transaction - * identifier. - *

- * Each transaction identifier MUST be unique.
- * Multiple transactions MAY be submitted with the same transaction - * identifier, but all except the first SHALL be rejected as duplicate - * transactions.
- * This identifier MUST specify a `payer` account to be charged - * all fees associated with the transaction.
- * This identifier MUST specify a "valid start time".
- * The "valid start time" MUST be strictly _earlier_ than the current - * network consensus time.
- * The "valid start time" MUST NOT be more than the current network - * configuration value for `transaction.maxValidDuration` seconds - * before the current network consensus time.
- * This identifier MUST NOT set the `scheduled` flag.
- * This identifier MUST NOT set a nonce value. - */ - TransactionID transactionID = 1; - - /** - * A node account identifier. - *

- * This MUST identify the account of the consensus node to which - * this transaction is submitted. - */ - AccountID nodeAccountID = 2; - - /** - * A maximum transaction fee, in tinybar. - *

- * The network SHALL NOT charge a transaction fee that exceeds this - * amount.
- * The network MAY charge up to this amount, and reject the transaction, - * if the amount offered is insufficient to cover the required fees.
- * The network MAY charge a minimum fee equal to 80% of the amount offered - * if the amount offered is much larger than the required fees. - */ - uint64 transactionFee = 3; - - /** - * A maximum duration in which to execute this transaction. - *

- * This transaction SHALL be rejected as expired if the valid start time, - * extended by this duration, is less than the current network consensus - * time when the transaction is submitted.
- * This transaction SHALL be rejected with an invalid duration if this - * value is greater than the current network configuration value for - * `transaction.maxValidDuration`. - */ - Duration transactionValidDuration = 4; - - /** - * Records are always generated.
- * Obsolete option to not generate a record. - *

- * This flag SHALL be ignored. Every transaction SHALL generate a record, - * or block stream equivalent. - */ - bool generateRecord = 5 [deprecated = true]; - - /** - * A short description for this transaction. - *

- * This value, if set, MUST NOT exceed `transaction.maxMemoUtf8Bytes` - * (default 100) bytes when encoded as UTF-8. - */ - string memo = 6; - - // The fields here are ordered in strictly ascending field ordinal - // order due to limitations in PBJ. - oneof data { - /** - * Call a function defined on a smart contract. - */ - ContractCallTransactionBody contractCall = 7; - - /** - * Create a smart contract. - */ - ContractCreateTransactionBody contractCreateInstance = 8; - - /** - * Update a smart contract. - */ - ContractUpdateTransactionBody contractUpdateInstance = 9; - - /** - * An obsolete, and unsupported, operation to add a "live hash" to - * an account. - */ - CryptoAddLiveHashTransactionBody cryptoAddLiveHash = 10 [deprecated = true]; - - /** - * Create a new Hedera account. - */ - CryptoCreateTransactionBody cryptoCreateAccount = 11; - - /** - * Delete an Hedera account.
- * This will mark the account as deleted, and transfer all remaining - * HBAR to a receiver account. - */ - CryptoDeleteTransactionBody cryptoDelete = 12; - - /** - * An obsolete, and unsupported, operation to remove a "live hash" from - * an account. - */ - CryptoDeleteLiveHashTransactionBody cryptoDeleteLiveHash = 13 [deprecated = true]; - - /** - * Transfer HBAR between accounts. - */ - CryptoTransferTransactionBody cryptoTransfer = 14; - - /** - * Modify an Hedera account. - */ - CryptoUpdateTransactionBody cryptoUpdateAccount = 15; - - /** - * Append data to the end of a file. - */ - FileAppendTransactionBody fileAppend = 16; - - /** - * Create a new file. - */ - FileCreateTransactionBody fileCreate = 17; - - /** - * Delete a file.
- * This will remove the content of the file, and mark the file as - * deleted. - */ - FileDeleteTransactionBody fileDelete = 18; - - /** - * Modify a file.
- * This may modify any metadata, and/or _replace_ the content. - */ - FileUpdateTransactionBody fileUpdate = 19; - - /** - * Delete a file as an Hedera administrative function.
- * This is a privileged operation. - */ - SystemDeleteTransactionBody systemDelete = 20; - - /** - * Restore a file deleted via `systemDelete`.
- * This is a privileged operation. - */ - SystemUndeleteTransactionBody systemUndelete = 21; - - /** - * Delete a smart contract and transfer remaining balance - * to a specified account. - */ - ContractDeleteTransactionBody contractDeleteInstance = 22; - - /** - * Freeze the network.
- * This is actually several possible operations, and the caller - * should examine the "freeze service" for more detail.
- * This is a privileged operation. - */ - FreezeTransactionBody freeze = 23; - - /** - * Create a topic. - */ - ConsensusCreateTopicTransactionBody consensusCreateTopic = 24; - - /** - * Update a topic. - */ - ConsensusUpdateTopicTransactionBody consensusUpdateTopic = 25; - - /** - * Delete a topic. - */ - ConsensusDeleteTopicTransactionBody consensusDeleteTopic = 26; - - /** - * Submit a message to a topic.
- * A message may be "chunked", and submitted in parts, if the total - * message size exceeds the limit for a single transaction. - */ - ConsensusSubmitMessageTransactionBody consensusSubmitMessage = 27; - - /** - * Unsupported system transaction. - *

- * This transaction MAY be implemented in testing networks, but - * SHALL NOT be enabled or supported in production environments.
- * Clients MUST NOT call this method, and any such transaction SHALL - * be rejected.
- * A network MAY choose to charge punitive fees for attempting to - * execute an `uncheckedSubmit`. - */ - UncheckedSubmitBody uncheckedSubmit = 28; - - /** - * Create a new Hedera token. - */ - TokenCreateTransactionBody tokenCreation = 29; - - /** - * Freeze an account with respect to a token.
- * A frozen account cannot transact in that token until unfrozen. - */ - TokenFreezeAccountTransactionBody tokenFreeze = 31; - - /** - * Unfreeze an account with respect to a token. - */ - TokenUnfreezeAccountTransactionBody tokenUnfreeze = 32; - - /** - * Grant KYC to an account with respect to a token.
- * KYC is generally a "know your customer" assertion that a - * responsible entity has sufficient information to positively - * identify the account holder to relevant authorities. - */ - TokenGrantKycTransactionBody tokenGrantKyc = 33; - - /** - * Revoke KYC from an account with respect to a token. - */ - TokenRevokeKycTransactionBody tokenRevokeKyc = 34; - - /** - * Delete an Hedera token.
- * The token will be marked deleted. - */ - TokenDeleteTransactionBody tokenDeletion = 35; - - /** - * Update an Hedera token.
- * Depending on what fields are to be modified, the signature - * requirements will vary. See `TokenUpdateTransactionBody` for - * further detail. - */ - TokenUpdateTransactionBody tokenUpdate = 36; - - /** - * Mint new tokens.
- * All minted tokens will be delivered to the treasury account for - * the token type. The "mint key" for the token must sign this - * transaction. - */ - TokenMintTransactionBody tokenMint = 37; - - /** - * Burn tokens from the treasury account.
- * The "burn key" for the token must sign this transaction. - */ - TokenBurnTransactionBody tokenBurn = 38; - - /** - * Wipe tokens from an account.
- * This will remove a specified amount of fungible/common tokens or - * a specified list of non-fungible/unique serial numbered tokens - * of a given token type from an Hedera account. The removed tokens - * are _burned_ as if by a `tokenBurn` transaction.
- * The "wipe key" for the token must sign this transaction. - */ - TokenWipeAccountTransactionBody tokenWipe = 39; - - /** - * Associate tokens to an account. - */ - TokenAssociateTransactionBody tokenAssociate = 40; - - /** - * Dissociate tokens from an account. - */ - TokenDissociateTransactionBody tokenDissociate = 41; - - /** - * Create a schedule.
- * A schedule is a request to execute a specific transaction, included - * in the create body, in the future. The scheduled transaction may - * execute as soon as all signature requirements are met with the - * schedule create or a subsequent schedule sign transaction. - * A schedule may, alternatively, execute on expiration if - * long-term schedules are enabled and the schedule meets signature - * requirements at that time. - */ - ScheduleCreateTransactionBody scheduleCreate = 42; - - /** - * Delete a schedule.
- * The schedule will be marked as deleted. - */ - ScheduleDeleteTransactionBody scheduleDelete = 43; - - /** - * Sign a schedule.
- * Add one or more cryptographic keys to the list of keys that have - * signed a schedule, and which may serve to meet the signature - * requirements for the scheduled transaction. - */ - ScheduleSignTransactionBody scheduleSign = 44; - - /** - * Update the custom fee schedule for a token.
- * This transaction must be signed by the "fee schedule key" - * for the token. - */ - TokenFeeScheduleUpdateTransactionBody token_fee_schedule_update = 45; - - /** - * Pause a Token. - *

- * This transaction MUST be signed by the "pause key" for the token. - */ - TokenPauseTransactionBody token_pause = 46; - - /** - * Unpause a Token. - *

- * This transaction MUST be signed by the "pause key" for the token. - */ - TokenUnpauseTransactionBody token_unpause = 47; - - /** - * Add one or more approved allowances for spenders to transfer the - * paying account's hbar or tokens. - */ - CryptoApproveAllowanceTransactionBody cryptoApproveAllowance = 48; - - /** - * Delete one or more approvals for spenders to transfer the - * paying account's hbar or tokens. - */ - CryptoDeleteAllowanceTransactionBody cryptoDeleteAllowance = 49; - - /** - * Perform an Ethereum encoded transaction. - */ - EthereumTransactionBody ethereumTransaction = 50; - - /** - * Update the staking information.
- * This internal transaction is performed at the end of a staking - * period to complete staking calculations and indicate that new - * staking period has started. - */ - NodeStakeUpdateTransactionBody node_stake_update = 51; - - /** - * Provide a deterministic pseudorandom number based on network state. - */ - UtilPrngTransactionBody util_prng = 52; - - /** - * Update one or more non-fungible/unique tokens.
- * This will update metadata for one or more serial numbers within - * a collection (token type). - */ - TokenUpdateNftsTransactionBody token_update_nfts = 53; - - /** - * Create a new node in the network address book.
- * This is a privileged operation. - *

- * This transaction SHALL create a new consensus node record and add - * that record to the network address book. - */ - com.hedera.hapi.node.addressbook.NodeCreateTransactionBody nodeCreate = 54; - - /** - * Update a node in the network address book.
- * This is a privileged operation. - *

- * This transaction SHALL update an existing consensus node record in - * the network address book. - */ - com.hedera.hapi.node.addressbook.NodeUpdateTransactionBody nodeUpdate = 55; - - /** - * Delete a node from the network address book.
- * This is a privileged operation. - *

- * This transaction SHALL mark an existing consensus node record as - * deleted and remove that node from the network address book. - */ - com.hedera.hapi.node.addressbook.NodeDeleteTransactionBody nodeDelete = 56; - - /** - * Reject and return a token to treasury.
- * This transaction will transfer one or more tokens or token - * balances held by the requesting account to the treasury - * for each token type. - *

- * Each transfer MUST be one of the following: - *

    - *
  • A single non-fungible/unique token.
    • - *
  • The full balance held for a fungible/common - * token type.
    • - *
- * When complete, the requesting account SHALL NOT hold the - * rejected tokens.
- * Custom fees and royalties defined for the tokens rejected - * SHALL NOT be charged for this transaction. - */ - TokenRejectTransactionBody tokenReject = 57; - - /** - * "Airdrop" tokens.
- * This transaction sends tokens from one or more "sender" accounts - * to one or more "recipient" accounts. - *

- * If a recipient account cannot immediately receive the token(s) sent, - * a "pending" airdrop SHALL be created and MUST be claimed. - */ - TokenAirdropTransactionBody tokenAirdrop = 58; - - /** - * Cancel one or more "pending" airdrops that are not yet claimed. - */ - TokenCancelAirdropTransactionBody tokenCancelAirdrop = 59; - - /** - * Claim one or more "pending" airdrops. - */ - TokenClaimAirdropTransactionBody tokenClaimAirdrop = 60; - - /** - * A transaction body for signature of a state root hash gossiped to other nodes - */ - com.hedera.hapi.platform.event.StateSignatureTransaction state_signature_transaction = 65; - } -} diff --git a/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java b/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java index bb67fb0980e1..5321c6bd01c4 100644 --- a/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java +++ b/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java @@ -27,7 +27,7 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.transaction.Query; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.pbj.runtime.io.buffer.Bytes; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hapi/src/main/java/com/hedera/hapi/util/UnknownHederaFunctionality.java b/hapi/src/main/java/com/hedera/hapi/util/UnknownHederaFunctionality.java index 03bd581a61ef..8b6b2f914be9 100644 --- a/hapi/src/main/java/com/hedera/hapi/util/UnknownHederaFunctionality.java +++ b/hapi/src/main/java/com/hedera/hapi/util/UnknownHederaFunctionality.java @@ -18,7 +18,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.transaction.Query; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; /** * Exception raised when mapping from {@link TransactionBody} or {@link Query} to {@link HederaFunctionality} diff --git a/hapi/src/testFixtures/java/com/hedera/node/hapi/fixtures/TransactionHelper.java b/hapi/src/testFixtures/java/com/hedera/node/hapi/fixtures/TransactionHelper.java index 1fe6b5635e40..32dfa3c10759 100644 --- a/hapi/src/testFixtures/java/com/hedera/node/hapi/fixtures/TransactionHelper.java +++ b/hapi/src/testFixtures/java/com/hedera/node/hapi/fixtures/TransactionHelper.java @@ -31,8 +31,8 @@ import com.hedera.hapi.node.token.CryptoGetLiveHashQuery; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody.Builder; +import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody.Builder; import com.hedera.hapi.node.transaction.UncheckedSubmitBody; import com.hedera.pbj.runtime.Codec; import com.hedera.pbj.runtime.io.buffer.Bytes; diff --git a/hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/CommonPbjConverters.java b/hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/CommonPbjConverters.java index 46a1758ae679..5a90a456e04a 100644 --- a/hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/CommonPbjConverters.java +++ b/hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/CommonPbjConverters.java @@ -45,7 +45,7 @@ import com.hedera.hapi.node.transaction.CustomFee; import com.hedera.hapi.node.transaction.ExchangeRate; import com.hedera.hapi.node.transaction.Query; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.pbj.runtime.Codec; import com.hedera.pbj.runtime.ParseException; diff --git a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeCreateHandler.java b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeCreateHandler.java index ce83ac33e636..12861c9ff138 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeCreateHandler.java +++ b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeCreateHandler.java @@ -34,7 +34,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.state.addressbook.Node; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.service.addressbook.impl.records.NodeCreateStreamBuilder; import com.hedera.node.app.service.addressbook.impl.validators.AddressBookValidator; diff --git a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeDeleteHandler.java b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeDeleteHandler.java index 1b204a9aa3ea..d5dfedc7fa6b 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeDeleteHandler.java +++ b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeDeleteHandler.java @@ -28,7 +28,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.state.addressbook.Node; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.spi.fees.FeeContext; diff --git a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeUpdateHandler.java b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeUpdateHandler.java index 50d5e1fd59bf..265edac6982e 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeUpdateHandler.java +++ b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeUpdateHandler.java @@ -33,7 +33,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.state.addressbook.Node; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.service.addressbook.impl.validators.AddressBookValidator; diff --git a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeCreateHandlerTest.java b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeCreateHandlerTest.java index fe47a4dc9563..def90845132f 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeCreateHandlerTest.java +++ b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeCreateHandlerTest.java @@ -44,7 +44,7 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ServiceEndpoint; import com.hedera.hapi.node.base.TransactionID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.service.addressbook.impl.handlers.NodeCreateHandler; import com.hedera.node.app.service.addressbook.impl.records.NodeCreateStreamBuilder; diff --git a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeDeleteHandlerTest.java b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeDeleteHandlerTest.java index e942386a435d..3a1a05b16807 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeDeleteHandlerTest.java +++ b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeDeleteHandlerTest.java @@ -38,7 +38,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.addressbook.Node; import com.hedera.hapi.node.state.common.EntityNumber; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.ReadableNodeStoreImpl; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; diff --git a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeUpdateHandlerTest.java b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeUpdateHandlerTest.java index aad684226d78..d0a86326a1e0 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeUpdateHandlerTest.java +++ b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeUpdateHandlerTest.java @@ -42,7 +42,7 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ServiceEndpoint; import com.hedera.hapi.node.base.TransactionID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.service.addressbook.impl.handlers.NodeUpdateHandler; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java index 2712503cd48e..3670489da305 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java @@ -17,7 +17,7 @@ package com.hedera.node.app.spi; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.signatures.SignatureVerifier; import com.hedera.node.app.spi.throttle.Throttle; import com.swirlds.common.crypto.Signature; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/authorization/Authorizer.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/authorization/Authorizer.java index e1fe93a47abf..eb719150c081 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/authorization/Authorizer.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/authorization/Authorizer.java @@ -18,7 +18,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/FeeContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/FeeContext.java index 409c30dd4450..27097cfc442f 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/FeeContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/FeeContext.java @@ -17,7 +17,7 @@ package com.hedera.node.app.spi.fees; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.authorization.Authorizer; import com.swirlds.config.api.Configuration; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/store/StoreFactory.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/store/StoreFactory.java index 644d4888b0cd..05b32d66e0c1 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/store/StoreFactory.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/store/StoreFactory.java @@ -16,7 +16,7 @@ package com.hedera.node.app.spi.store; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/throttle/Throttle.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/throttle/Throttle.java index 0d50fa2e5aed..05379602e792 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/throttle/Throttle.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/throttle/Throttle.java @@ -19,7 +19,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.AppContext; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/DispatchOptions.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/DispatchOptions.java index 34977d66c1d1..62a341dad7d7 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/DispatchOptions.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/DispatchOptions.java @@ -22,7 +22,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.HandleContext.ConsensusThrottling; import com.hedera.node.app.spi.workflows.HandleContext.TransactionCategory; import com.hedera.node.app.spi.workflows.record.StreamBuilder; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java index f0c95d1ff757..01c6f2d3ed3b 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java @@ -18,7 +18,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.authorization.SystemPrivilege; import com.hedera.node.app.spi.fees.ExchangeRateInfo; import com.hedera.node.app.spi.fees.Fees; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/PreHandleContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/PreHandleContext.java index 1336dd697954..121b95df3168 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/PreHandleContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/PreHandleContext.java @@ -22,7 +22,7 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.pbj.runtime.io.buffer.Bytes; import com.swirlds.config.api.Configuration; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java index 4f7488edb625..4aae37f6049d 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java @@ -16,7 +16,7 @@ package com.hedera.node.app.spi.workflows; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.swirlds.config.api.Configuration; import com.swirlds.state.lifecycle.info.NetworkInfo; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/TransactionHandler.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/TransactionHandler.java index 78b862a60ed7..c12dffceda26 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/TransactionHandler.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/TransactionHandler.java @@ -16,7 +16,7 @@ package com.hedera.node.app.spi.workflows; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/WarmupContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/WarmupContext.java index f85dfb75656c..068b63c787d3 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/WarmupContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/WarmupContext.java @@ -16,7 +16,7 @@ package com.hedera.node.app.spi.workflows; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/record/StreamBuilder.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/record/StreamBuilder.java index c2a1e4d1b027..6c4e6fe80bf0 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/record/StreamBuilder.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/record/StreamBuilder.java @@ -33,7 +33,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.HandleContext; import com.hedera.pbj.runtime.io.buffer.Bytes; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TransactionFactory.java b/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TransactionFactory.java index e14fa3c65b69..22541802e772 100644 --- a/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TransactionFactory.java +++ b/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TransactionFactory.java @@ -23,7 +23,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.pbj.runtime.Codec; import com.hedera.pbj.runtime.io.buffer.Bytes; import com.hedera.pbj.runtime.io.stream.WritableStreamingData; diff --git a/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/workflows/FakePreHandleContext.java b/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/workflows/FakePreHandleContext.java index 1adaec3bedbb..3b060529df07 100644 --- a/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/workflows/FakePreHandleContext.java +++ b/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/workflows/FakePreHandleContext.java @@ -30,7 +30,7 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.PreHandleContext; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java index 41cfa0572179..6126dfa6cfca 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java @@ -56,7 +56,7 @@ import com.hedera.hapi.node.state.blockrecords.BlockInfo; import com.hedera.hapi.node.state.blockstream.BlockStreamInfo; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.platform.event.StateSignatureTransaction; import com.hedera.hapi.platform.state.PlatformState; import com.hedera.hapi.util.HapiUtils; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/AuthorizerImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/AuthorizerImpl.java index 811943949cdc..ebe44f8809df 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/AuthorizerImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/AuthorizerImpl.java @@ -24,7 +24,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.authorization.Authorizer; import com.hedera.node.app.spi.authorization.SystemPrivilege; import com.hedera.node.config.ConfigProvider; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/PrivilegesVerifier.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/PrivilegesVerifier.java index 5b4e4e38b433..e331fe8708bb 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/PrivilegesVerifier.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/PrivilegesVerifier.java @@ -27,7 +27,7 @@ import com.hedera.hapi.node.file.SystemDeleteTransactionBody; import com.hedera.hapi.node.file.SystemUndeleteTransactionBody; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.authorization.SystemPrivilege; import com.hedera.node.config.ConfigProvider; import com.hedera.node.config.data.AccountsConfig; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamBuilder.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamBuilder.java index 048d9b47b409..3c31cc31370e 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamBuilder.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamBuilder.java @@ -60,7 +60,7 @@ import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.PendingAirdropRecord; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.TransactionReceipt; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.platform.event.EventTransaction; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/PairedStreamBuilder.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/PairedStreamBuilder.java index 79a80297ac55..522a18798af9 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/PairedStreamBuilder.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/PairedStreamBuilder.java @@ -36,7 +36,7 @@ import com.hedera.hapi.node.transaction.AssessedCustomFee; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.PendingAirdropRecord; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.streams.ContractActions; import com.hedera.hapi.streams.ContractBytecode; import com.hedera.hapi.streams.ContractStateChanges; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/ChildFeeContextImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/ChildFeeContextImpl.java index 560132398f49..c849d446b961 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/ChildFeeContextImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/ChildFeeContextImpl.java @@ -22,7 +22,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.spi.authorization.Authorizer; import com.hedera.node.app.spi.fees.FeeCalculator; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeCalculatorImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeCalculatorImpl.java index 858ea23c5a1e..2c383c331ea2 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeCalculatorImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeCalculatorImpl.java @@ -34,7 +34,7 @@ import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.ExchangeRate; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.hapi.fees.calc.OverflowCheckingCalc; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeContextImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeContextImpl.java index 4a86e8c4fd41..9ef8aca6db8c 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeContextImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeContextImpl.java @@ -20,7 +20,7 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.authorization.Authorizer; import com.hedera.node.app.spi.fees.FeeCalculator; import com.hedera.node.app.spi.fees.FeeCalculatorFactory; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeManager.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeManager.java index 2adfb323d44e..451ff07151b0 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeManager.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeManager.java @@ -34,7 +34,7 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TransactionFeeSchedule; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.spi.fees.FeeCalculator; import com.hedera.node.app.store.ReadableStoreFactory; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/CongestionMultipliers.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/CongestionMultipliers.java index a809acfd363b..a423f39355e4 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/CongestionMultipliers.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/CongestionMultipliers.java @@ -19,7 +19,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.store.ReadableStoreFactory; import com.hedera.node.app.throttle.annotations.GasThrottleMultiplier; import com.hedera.node.app.workflows.TransactionInfo; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplier.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplier.java index 227e6eabe381..fa0ae5b7f3a4 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplier.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplier.java @@ -27,7 +27,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.contract.impl.state.ContractStateStore; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/ServiceScopeLookup.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/ServiceScopeLookup.java index d49ccd596af5..c7c069d3dd52 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/ServiceScopeLookup.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/ServiceScopeLookup.java @@ -16,7 +16,7 @@ package com.hedera.node.app.services; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.AddressBookService; import com.hedera.node.app.service.consensus.ConsensusService; import com.hedera.node.app.service.contract.ContractService; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/logging/TransactionStateLogger.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/logging/TransactionStateLogger.java index dadadd25ef77..29070f5fd3f6 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/logging/TransactionStateLogger.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/logging/TransactionStateLogger.java @@ -22,7 +22,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.base.TransactionID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.node.app.workflows.prehandle.PreHandleResult; import com.swirlds.platform.system.Round; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/AppThrottleFactory.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/AppThrottleFactory.java index 4ca258a377f5..a96208531c40 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/AppThrottleFactory.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/AppThrottleFactory.java @@ -25,7 +25,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; import com.hedera.node.app.spi.throttle.Throttle; import com.hedera.node.app.workflows.TransactionInfo; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/NetworkUtilizationManagerImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/NetworkUtilizationManagerImpl.java index 3f4e6870f566..8d58e4a72436 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/NetworkUtilizationManagerImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/NetworkUtilizationManagerImpl.java @@ -24,7 +24,7 @@ import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.base.TransactionID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.throttle.annotations.BackendThrottle; import com.hedera.node.app.workflows.TransactionInfo; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleAccumulator.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleAccumulator.java index f2065b758847..b36cba77110d 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleAccumulator.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleAccumulator.java @@ -51,7 +51,7 @@ import com.hedera.hapi.node.token.TokenMintTransactionBody; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.hapi.utils.sysfiles.domain.throttling.ThrottleBucket; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleServiceManager.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleServiceManager.java index fe4365cd9694..c1731c2d140d 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleServiceManager.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleServiceManager.java @@ -29,7 +29,7 @@ import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshot; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/SolvencyPreCheck.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/SolvencyPreCheck.java index e38108936c6a..ca09b70f056a 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/SolvencyPreCheck.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/SolvencyPreCheck.java @@ -34,7 +34,7 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java index 56fd293a2bd8..63eb563d73a2 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java @@ -41,7 +41,7 @@ import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.annotations.MaxSignedTxnSize; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java index 433932867c7c..a55b6e776285 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java @@ -22,7 +22,7 @@ import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.pbj.runtime.io.buffer.Bytes; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java index 8fefb69a281d..06174347dbef 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java @@ -19,7 +19,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/DispatchHandleContext.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/DispatchHandleContext.java index 2e8920926785..f1a1ef11012d 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/DispatchHandleContext.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/DispatchHandleContext.java @@ -30,7 +30,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TransactionID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ChildFeeContextImpl; import com.hedera.node.app.fees.ExchangeRateManager; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/cache/CacheWarmer.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/cache/CacheWarmer.java index 8540963d4747..bd7e86039044 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/cache/CacheWarmer.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/cache/CacheWarmer.java @@ -20,7 +20,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TransactionID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.TransactionHandler; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactory.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactory.java index cf473a84276c..0174c7c6584c 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactory.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactory.java @@ -40,7 +40,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeAccumulator; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizer.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizer.java index 6797428908f3..65415e3b1cbb 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizer.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizer.java @@ -24,7 +24,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.TransferList; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.FinalizeRecordHandler; import com.hedera.node.app.spi.workflows.record.StreamBuilder; import com.hedera.node.app.workflows.handle.Dispatch; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/RecordStreamBuilder.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/RecordStreamBuilder.java index c97600b4dd3e..0f76d67292cd 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/RecordStreamBuilder.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/RecordStreamBuilder.java @@ -44,7 +44,7 @@ import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.PendingAirdropRecord; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.TransactionReceipt; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.streams.ContractActions; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/SystemSetup.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/SystemSetup.java index ec0320db7b9e..58589659ed84 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/SystemSetup.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/SystemSetup.java @@ -43,7 +43,7 @@ import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.transaction.ExchangeRateSet; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.ids.EntityIdService; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.schemas.V053AddressBookSchema; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletions.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletions.java index f018ef5c9827..9c2020e8b3d8 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletions.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletions.java @@ -26,7 +26,7 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.handlers.EthereumTransactionHandler; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdates.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdates.java index 699cc0be2983..767584d66292 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdates.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdates.java @@ -24,7 +24,7 @@ import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.roster.Roster; import com.hedera.hapi.node.state.roster.RosterEntry; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.roster.RosterService; import com.hedera.node.app.service.addressbook.AddressBookService; import com.hedera.node.app.service.addressbook.impl.ReadableNodeStoreImpl; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdates.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdates.java index 04f33a455081..31a2917d5089 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdates.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdates.java @@ -24,7 +24,7 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ServicesConfigurationList; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.config.ConfigProviderImpl; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/UserTxnFactory.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/UserTxnFactory.java index 1d87d8db27f1..f40218f7ed24 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/UserTxnFactory.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/UserTxnFactory.java @@ -33,7 +33,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.transaction.ExchangeRateSet; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.blocks.BlockStreamManager; import com.hedera.node.app.blocks.impl.BoundaryStateChangeListener; import com.hedera.node.app.blocks.impl.KVStateChangeListener; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManager.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManager.java index 5f5262686b8a..4406bd7fafd6 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManager.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManager.java @@ -33,7 +33,7 @@ import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; import com.hedera.node.app.throttle.CongestionThrottleService; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/ingest/SubmissionManager.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/ingest/SubmissionManager.java index b18b36f038f5..942200278fc9 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/ingest/SubmissionManager.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/ingest/SubmissionManager.java @@ -20,7 +20,7 @@ import static com.hedera.hapi.node.base.ResponseCodeEnum.PLATFORM_TRANSACTION_NOT_CREATED; import static java.util.Objects.requireNonNull; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.state.DeduplicationCache; import com.hedera.node.config.ConfigProvider; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImpl.java index b568236e4d89..1d9a4dbe5168 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImpl.java @@ -32,7 +32,7 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.PreHandleContext; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleWorkflowImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleWorkflowImpl.java index 4ea6daa459d3..9fa0a989221d 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleWorkflowImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleWorkflowImpl.java @@ -32,7 +32,7 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignaturePair; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.platform.event.StateSignatureTransaction; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.signature.ExpandedSignaturePair; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/query/QueryWorkflowImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/query/QueryWorkflowImpl.java index cc4edf0ecdc4..55308099f62a 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/query/QueryWorkflowImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/query/QueryWorkflowImpl.java @@ -36,7 +36,7 @@ import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.Response; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ExchangeRateManager; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutor.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutor.java index 32a7a0d7fba1..2962cbd8b30f 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutor.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutor.java @@ -16,7 +16,7 @@ package com.hedera.node.app.workflows.standalone; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.state.SingleTransactionRecord; import com.swirlds.state.State; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneDispatchFactory.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneDispatchFactory.java index 2edeb53e8815..e494e7a78f17 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneDispatchFactory.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneDispatchFactory.java @@ -28,7 +28,7 @@ import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.platform.event.EventTransaction; import com.hedera.node.app.blocks.impl.BoundaryStateChangeListener; import com.hedera.node.app.blocks.impl.KVStateChangeListener; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/authorization/PrivilegesVerifierTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/authorization/PrivilegesVerifierTest.java index c3d7d910419b..d5165d922906 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/authorization/PrivilegesVerifierTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/authorization/PrivilegesVerifierTest.java @@ -65,7 +65,7 @@ class PrivilegesVerifierTest { private record TestCase( com.hedera.hapi.node.base.AccountID payerId, com.hedera.hapi.node.base.HederaFunctionality function, - com.hedera.hapi.node.transaction.TransactionBody txn) { + com.hedera.hapi.node.base.TransactionBody txn) { public TestCase withPayerId(com.hedera.hapi.node.base.AccountID newPayerId) { return new TestCase(newPayerId, function, txn); } @@ -90,12 +90,12 @@ boolean canPerformNonCryptoUpdate(final long accountNum, final long fileNum) { final var fileID = com.hedera.hapi.node.base.FileID.newBuilder() .fileNum(fileNum) .build(); - final var fileUpdateTxBody = com.hedera.hapi.node.transaction.TransactionBody.newBuilder() + final var fileUpdateTxBody = com.hedera.hapi.node.base.TransactionBody.newBuilder() .fileUpdate(com.hedera.hapi.node.file.FileUpdateTransactionBody.newBuilder() .fileID(fileID) .build()) .build(); - final var fileAppendTxBody = com.hedera.hapi.node.transaction.TransactionBody.newBuilder() + final var fileAppendTxBody = com.hedera.hapi.node.base.TransactionBody.newBuilder() .fileAppend(com.hedera.hapi.node.file.FileAppendTransactionBody.newBuilder() .fileID(fileID) .build()) diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java index 341fb53911b9..bede32e5c82c 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java @@ -39,7 +39,7 @@ import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.AssessedCustomFee; import com.hedera.hapi.node.transaction.ExchangeRateSet; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.streams.ContractStateChanges; import com.hedera.node.app.blocks.impl.BlockStreamBuilder; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/ChildFeeContextImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/ChildFeeContextImplTest.java index b2f053aa01c5..1b3bdaaabe42 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/ChildFeeContextImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/ChildFeeContextImplTest.java @@ -30,7 +30,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.authorization.Authorizer; import com.hedera.node.app.spi.fees.FeeCalculator; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/FeeCalculatorImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/FeeCalculatorImplTest.java index 71b9b1b37ffb..0ac7be7e329f 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/FeeCalculatorImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/FeeCalculatorImplTest.java @@ -25,7 +25,7 @@ import com.hedera.hapi.node.base.*; import com.hedera.hapi.node.transaction.ExchangeRate; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.fixtures.state.FakeState; import com.hedera.node.app.store.ReadableStoreFactory; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplierTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplierTest.java index add2fca2116d..17351071de78 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplierTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplierTest.java @@ -49,7 +49,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenMintTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fixtures.state.FakeState; import com.hedera.node.app.service.consensus.ConsensusService; import com.hedera.node.app.service.consensus.impl.ConsensusServiceImpl; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleAdviserTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleAdviserTest.java index c7b8ec6677bd..b16fc310f1cc 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleAdviserTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleAdviserTest.java @@ -26,7 +26,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.workflows.TransactionInfo; import com.hedera.node.app.workflows.handle.record.RecordStreamBuilder; import com.hedera.node.app.workflows.handle.stack.SavepointStackImpl; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleFactoryTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleFactoryTest.java index e0000a5a30e8..37ba6ea706fd 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleFactoryTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleFactoryTest.java @@ -34,7 +34,7 @@ import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; import com.hedera.node.app.hapi.utils.throttles.GasLimitDeterministicThrottle; import com.hedera.node.app.workflows.TransactionInfo; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java index a69ebaf820cb..ce4ca788dfd6 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java @@ -66,7 +66,7 @@ import com.hedera.hapi.node.token.TokenMintTransactionBody; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.sysfiles.domain.throttling.ScaleFactor; import com.hedera.node.app.hapi.utils.throttles.BucketThrottle; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/impl/NetworkUtilizationManagerImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/impl/NetworkUtilizationManagerImplTest.java index 98a584cad828..2a1f49acd92f 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/impl/NetworkUtilizationManagerImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/impl/NetworkUtilizationManagerImplTest.java @@ -23,7 +23,7 @@ import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.base.TransactionID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; import com.hedera.node.app.hapi.utils.throttles.GasLimitDeterministicThrottle; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/SolvencyPreCheckTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/SolvencyPreCheckTest.java index 81030930c343..a5d123c33c31 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/SolvencyPreCheckTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/SolvencyPreCheckTest.java @@ -43,7 +43,7 @@ import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java index 3cfbf371c59f..ad6cd70b3ded 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java @@ -49,7 +49,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusCreateTopicTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fixtures.AppTestBase; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java index aa9e897edaf5..77b10b2e39be 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java @@ -29,7 +29,7 @@ import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.fixtures.Scenarios; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java index 70ff7adeec05..f7e5db86603e 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java @@ -68,7 +68,7 @@ import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ChildFeeContextImpl; import com.hedera.node.app.fees.ExchangeRateManager; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchProcessorTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchProcessorTest.java index 1e360bb0a73b..eb4456e7b16f 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchProcessorTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchProcessorTest.java @@ -58,7 +58,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.transaction.ExchangeRateSet; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeAccumulator; import com.hedera.node.app.service.contract.impl.handlers.EthereumTransactionHandler; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactoryTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactoryTest.java index 373cbf4daacc..bab505597646 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactoryTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactoryTest.java @@ -35,7 +35,7 @@ import com.hedera.hapi.node.base.ThresholdKey; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java index 8433a9f0f139..7f2a3faafe46 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java @@ -40,7 +40,7 @@ import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.FinalizeRecordHandler; import com.hedera.node.app.service.token.records.FinalizeContext; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ValidationReporterTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ValidationReporterTest.java index ffb37751b6be..c745de732020 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ValidationReporterTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ValidationReporterTest.java @@ -50,7 +50,7 @@ import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.signature.AppKeyVerifier; import com.hedera.node.app.signature.impl.SignatureVerificationImpl; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/record/RecordTestData.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/record/RecordTestData.java index e48ba6ce9f09..434e4deb38c9 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/record/RecordTestData.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/record/RecordTestData.java @@ -23,7 +23,7 @@ import com.hedera.hapi.node.base.TokenType; import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.streams.HashAlgorithm; import com.hedera.hapi.streams.HashObject; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java index f7d049c16412..ddf4c644e482 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java @@ -39,7 +39,7 @@ import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxSigs; import com.hedera.node.app.service.contract.impl.handlers.EthereumTransactionHandler; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java index 6879ed150fbb..e9dee34dcdd8 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java @@ -47,7 +47,7 @@ import com.hedera.hapi.node.state.roster.RoundRosterPair; import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.platform.state.PlatformState; import com.hedera.node.app.fixtures.state.FakeState; import com.hedera.node.app.roster.RosterService; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java index 6eaa0e86074d..560c3d974e7b 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java @@ -31,7 +31,7 @@ import com.hedera.hapi.node.file.FileUpdateTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.config.ConfigProviderImpl; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/UserTxnTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/UserTxnTest.java index d17cf93e1b2c..89c98377c609 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/UserTxnTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/UserTxnTest.java @@ -37,7 +37,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.transaction.ExchangeRateSet; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.platform.event.EventTransaction; import com.hedera.node.app.blocks.BlockStreamManager; import com.hedera.node.app.blocks.impl.BlockStreamBuilder; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManagerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManagerTest.java index 8ae80416e730..b2db3cfdc8e9 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManagerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManagerTest.java @@ -45,7 +45,7 @@ import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestCheckerTest.java index a287e74111e1..f301c2c176b9 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestCheckerTest.java @@ -57,7 +57,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.UncheckedSubmitBody; import com.hedera.node.app.fees.FeeManager; import com.hedera.node.app.fixtures.AppTestBase; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java index f49f31cccede..213f8e034222 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java @@ -41,7 +41,7 @@ import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.base.TransactionID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.TransactionResponse; import com.hedera.node.app.fixtures.AppTestBase; import com.hedera.node.app.spi.workflows.PreCheckException; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/SubmissionManagerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/SubmissionManagerTest.java index 2c7cc66c5d31..45e0d76f5365 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/SubmissionManagerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/SubmissionManagerTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.when; import com.hedera.hapi.node.base.TransactionID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.UncheckedSubmitBody; import com.hedera.node.app.fixtures.AppTestBase; import com.hedera.node.app.spi.workflows.PreCheckException; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImplTest.java index eba0292e00b3..da86a0f3adbf 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImplTest.java @@ -38,7 +38,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.fixtures.Scenarios; import com.hedera.node.app.spi.workflows.PreCheckException; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextListUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextListUpdatesTest.java index 015ae6cfed6e..1c2ad4383c8d 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextListUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextListUpdatesTest.java @@ -38,7 +38,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.PreHandleContext; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryCheckerTest.java index 27acf862ffcc..1e16cffa3770 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryCheckerTest.java @@ -46,7 +46,7 @@ import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.FeeManager; import com.hedera.node.app.fixtures.AppTestBase; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryWorkflowImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryWorkflowImplTest.java index dd4fbd5f21bc..eb574fdd0b8f 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryWorkflowImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryWorkflowImplTest.java @@ -57,7 +57,7 @@ import com.hedera.hapi.node.network.NetworkGetExecutionTimeResponse; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.Response; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; import com.hedera.node.app.fixtures.AppTestBase; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/standalone/TransactionExecutorsTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/standalone/TransactionExecutorsTest.java index 5b3c3264546d..c47ef61e0669 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/standalone/TransactionExecutorsTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/standalone/TransactionExecutorsTest.java @@ -43,7 +43,7 @@ import com.hedera.hapi.node.state.blockrecords.BlockInfo; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.config.BootstrapConfigProviderImpl; import com.hedera.node.app.config.ConfigProviderImpl; import com.hedera.node.app.fees.FeeService; diff --git a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusCreateTopicHandler.java b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusCreateTopicHandler.java index 09245289ccf2..e4f001a3d9df 100644 --- a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusCreateTopicHandler.java +++ b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusCreateTopicHandler.java @@ -33,7 +33,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.state.consensus.Topic; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusDeleteTopicHandler.java b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusDeleteTopicHandler.java index 4990cfe14d2c..9fdfc91d2bca 100644 --- a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusDeleteTopicHandler.java +++ b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusDeleteTopicHandler.java @@ -27,7 +27,7 @@ import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.consensus.ConsensusDeleteTopicTransactionBody; import com.hedera.hapi.node.state.consensus.Topic; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.ConsensusServiceFeeBuilder; import com.hedera.node.app.hapi.utils.fee.SigValueObj; diff --git a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusSubmitMessageHandler.java b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusSubmitMessageHandler.java index 22a855b4f494..40298bc89e27 100644 --- a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusSubmitMessageHandler.java +++ b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusSubmitMessageHandler.java @@ -39,7 +39,7 @@ 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.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusUpdateTopicHandler.java b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusUpdateTopicHandler.java index da1364631903..803aa0d427de 100644 --- a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusUpdateTopicHandler.java +++ b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusUpdateTopicHandler.java @@ -41,7 +41,7 @@ import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.consensus.ConsensusUpdateTopicTransactionBody; import com.hedera.hapi.node.state.consensus.Topic; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.service.consensus.ReadableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusCreateTopicTest.java b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusCreateTopicTest.java index c4bc746a4f4f..2a6b7f7d00f7 100644 --- a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusCreateTopicTest.java +++ b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusCreateTopicTest.java @@ -42,7 +42,7 @@ import com.hedera.hapi.node.consensus.ConsensusCreateTopicTransactionBody; import com.hedera.hapi.node.state.consensus.Topic; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; import com.hedera.node.app.service.consensus.impl.handlers.ConsensusCreateTopicHandler; import com.hedera.node.app.service.consensus.impl.records.ConsensusCreateTopicStreamBuilder; diff --git a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusDeleteTopicTest.java b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusDeleteTopicTest.java index 205c9dc94405..18737c49c75d 100644 --- a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusDeleteTopicTest.java +++ b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusDeleteTopicTest.java @@ -39,7 +39,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusDeleteTopicTransactionBody; import com.hedera.hapi.node.state.consensus.Topic; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.consensus.impl.ReadableTopicStoreImpl; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusSubmitMessageHandlerTest.java b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusSubmitMessageHandlerTest.java index e5889f5b7f48..12895206800e 100644 --- a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusSubmitMessageHandlerTest.java +++ b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusSubmitMessageHandlerTest.java @@ -44,7 +44,7 @@ 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.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.consensus.impl.ReadableTopicStoreImpl; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusUpdateTopicHandlerTest.java b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusUpdateTopicHandlerTest.java index a24d80e55d46..c621a73f008a 100644 --- a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusUpdateTopicHandlerTest.java +++ b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusUpdateTopicHandlerTest.java @@ -45,7 +45,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusUpdateTopicTransactionBody; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.consensus.impl.handlers.ConsensusUpdateTopicHandler; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileAppendHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileAppendHandler.java index bc56669bf166..3e56416fc896 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileAppendHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileAppendHandler.java @@ -31,7 +31,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.file.FileAppendTransactionBody; import com.hedera.hapi.node.state.file.File; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.file.FileSignatureWaivers; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileCreateHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileCreateHandler.java index 0a93bee426c2..bf71d59fca96 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileCreateHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileCreateHandler.java @@ -30,7 +30,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.file.FileCreateTransactionBody; import com.hedera.hapi.node.state.file.File; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.file.FileOpsUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileDeleteHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileDeleteHandler.java index 810aa1279a6e..8cc8c61f109d 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileDeleteHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileDeleteHandler.java @@ -28,7 +28,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.file.FileDeleteTransactionBody; import com.hedera.hapi.node.state.file.File; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSignatureWaiversImpl.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSignatureWaiversImpl.java index b781dd6ba0fc..8f44e72e4dc8 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSignatureWaiversImpl.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSignatureWaiversImpl.java @@ -20,7 +20,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.file.FileSignatureWaivers; import com.hedera.node.app.spi.authorization.Authorizer; import com.hedera.node.app.spi.authorization.SystemPrivilege; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemDeleteHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemDeleteHandler.java index a42887297f42..3e199e73c214 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemDeleteHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemDeleteHandler.java @@ -25,7 +25,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TimestampSeconds; import com.hedera.hapi.node.state.file.File; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemUndeleteHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemUndeleteHandler.java index 1b7a548365fa..1fc49168505c 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemUndeleteHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemUndeleteHandler.java @@ -23,7 +23,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.state.file.File; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileUpdateHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileUpdateHandler.java index 5ecbf7980f56..97234b893be7 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileUpdateHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileUpdateHandler.java @@ -37,7 +37,7 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.file.FileUpdateTransactionBody; import com.hedera.hapi.node.state.file.File; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.file.ExtantFileContext; import com.hedera.node.app.hapi.fees.usage.file.FileOpsUsage; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/V0490FileSchema.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/V0490FileSchema.java index b0cdd7bdc6d7..e479b9ececb5 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/V0490FileSchema.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/V0490FileSchema.java @@ -49,7 +49,7 @@ import com.hedera.hapi.node.transaction.ExchangeRate; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.spi.workflows.SystemContext; import com.hedera.node.config.ConfigProvider; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileAppendHandlerTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileAppendHandlerTest.java index eabf035e71ae..5278aed04ab2 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileAppendHandlerTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileAppendHandlerTest.java @@ -40,7 +40,7 @@ import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.primitives.ProtoBytes; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.WritableFileStore; import com.hedera.node.app.service.file.impl.WritableUpgradeFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileCreateTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileCreateTest.java index 20203ac9d339..85a8e80e651f 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileCreateTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileCreateTest.java @@ -44,7 +44,7 @@ import com.hedera.hapi.node.file.FileCreateTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.file.FileOpsUsage; import com.hedera.node.app.service.file.impl.WritableFileStore; import com.hedera.node.app.service.file.impl.handlers.FileCreateHandler; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileDeleteTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileDeleteTest.java index eb284d5f22f8..8a470c464d4d 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileDeleteTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileDeleteTest.java @@ -39,7 +39,7 @@ import com.hedera.hapi.node.file.FileDeleteTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.ReadableFileStoreImpl; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSignatureWaiversImplTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSignatureWaiversImplTest.java index 64599f490d05..07876977d2a3 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSignatureWaiversImplTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSignatureWaiversImplTest.java @@ -21,7 +21,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.file.impl.handlers.FileSignatureWaiversImpl; import com.hedera.node.app.spi.authorization.Authorizer; import com.hedera.node.app.spi.authorization.SystemPrivilege; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemDeleteTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemDeleteTest.java index cf6eb7d8cf91..a5be4092992e 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemDeleteTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemDeleteTest.java @@ -40,7 +40,7 @@ import com.hedera.hapi.node.file.SystemDeleteTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.ReadableFileStoreImpl; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemUndeleteTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemUndeleteTest.java index 5ea4e57fae61..0e6ffd4dbbc2 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemUndeleteTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemUndeleteTest.java @@ -40,7 +40,7 @@ import com.hedera.hapi.node.file.SystemUndeleteTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.ReadableFileStoreImpl; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileUpdateTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileUpdateTest.java index e21ed0da70ae..ba77e80c630e 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileUpdateTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileUpdateTest.java @@ -39,7 +39,7 @@ import com.hedera.hapi.node.file.FileUpdateTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.file.FileOpsUsage; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.WritableFileStore; diff --git a/hedera-node/hedera-file-service/src/main/java/com/hedera/node/app/service/file/FileSignatureWaivers.java b/hedera-node/hedera-file-service/src/main/java/com/hedera/node/app/service/file/FileSignatureWaivers.java index 9eab2ce9980a..87900608d327 100644 --- a/hedera-node/hedera-file-service/src/main/java/com/hedera/node/app/service/file/FileSignatureWaivers.java +++ b/hedera-node/hedera-file-service/src/main/java/com/hedera/node/app/service/file/FileSignatureWaivers.java @@ -17,7 +17,7 @@ package com.hedera.node.app.service.file; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.SigWaivers; /** diff --git a/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/FreezeHandler.java b/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/FreezeHandler.java index 3b8e154e7391..d94bb862b87f 100644 --- a/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/FreezeHandler.java +++ b/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/FreezeHandler.java @@ -29,7 +29,7 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.freeze.FreezeTransactionBody; import com.hedera.hapi.node.freeze.FreezeType; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.file.ReadableUpgradeFileStore; import com.hedera.node.app.service.networkadmin.ReadableFreezeStore; diff --git a/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/NetworkUncheckedSubmitHandler.java b/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/NetworkUncheckedSubmitHandler.java index 22c10626e6a9..f56aa6ead690 100644 --- a/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/NetworkUncheckedSubmitHandler.java +++ b/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/NetworkUncheckedSubmitHandler.java @@ -20,7 +20,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-network-admin-service-impl/src/test/java/com/hedera/node/app/service/networkadmin/impl/test/handlers/FreezeHandlerTest.java b/hedera-node/hedera-network-admin-service-impl/src/test/java/com/hedera/node/app/service/networkadmin/impl/test/handlers/FreezeHandlerTest.java index ce52d8bc7049..2c8754bf59dd 100644 --- a/hedera-node/hedera-network-admin-service-impl/src/test/java/com/hedera/node/app/service/networkadmin/impl/test/handlers/FreezeHandlerTest.java +++ b/hedera-node/hedera-network-admin-service-impl/src/test/java/com/hedera/node/app/service/networkadmin/impl/test/handlers/FreezeHandlerTest.java @@ -45,7 +45,7 @@ import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.file.ReadableUpgradeFileStore; import com.hedera.node.app.service.networkadmin.impl.WritableFreezeStore; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java index 1fc81ffe9942..41d6e64c4527 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java @@ -38,7 +38,7 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.schedule.ReadableScheduleStore; import com.hedera.node.app.service.schedule.ScheduleStreamBuilder; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java index 9615a5689602..e8cc50c0ca7b 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java @@ -25,7 +25,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody.DataOneOfType; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.HandleException; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java index 16512ce547f1..7e492d3dca32 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java @@ -49,7 +49,7 @@ import com.hedera.hapi.node.state.schedule.Schedule; import com.hedera.hapi.node.state.schedule.ScheduledOrder; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.schedule.ScheduleOpsUsage; import com.hedera.node.app.hapi.utils.fee.SigValueObj; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandler.java index ea4dfa3e504e..b1d4eac177ea 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandler.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandler.java @@ -33,7 +33,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.scheduled.ScheduleDeleteTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.schedule.ScheduleOpsUsage; import com.hedera.node.app.hapi.utils.fee.SigValueObj; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandler.java index 5839bba11a4e..77b9718ded76 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandler.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandler.java @@ -30,7 +30,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.scheduled.ScheduleSignTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.schedule.ScheduleOpsUsage; import com.hedera.node.app.hapi.utils.fee.SigValueObj; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduleTestBase.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduleTestBase.java index fb6245892554..15b36406b588 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduleTestBase.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduleTestBase.java @@ -78,7 +78,7 @@ import com.hedera.hapi.node.token.TokenUnpauseTransactionBody; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; import com.hedera.hapi.node.token.TokenWipeAccountTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.util.UtilPrngTransactionBody; import com.hedera.node.app.service.schedule.ReadableScheduleStore; import com.hedera.node.app.service.schedule.WritableScheduleStore; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduledTransactionFactory.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduledTransactionFactory.java index 2cc2b8d888b8..389f37a99e82 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduledTransactionFactory.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduledTransactionFactory.java @@ -25,7 +25,7 @@ import com.hedera.hapi.node.scheduled.ScheduleCreateTransactionBody; import com.hedera.hapi.node.scheduled.ScheduleCreateTransactionBody.Builder; import com.hedera.hapi.node.token.TokenBurnTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import edu.umd.cs.findbugs.annotations.NonNull; public final class ScheduledTransactionFactory { diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtilityTest.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtilityTest.java index 6f4bff5e65a3..5539af7efc80 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtilityTest.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtilityTest.java @@ -23,7 +23,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody.DataOneOfType; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.PreCheckException; import edu.umd.cs.findbugs.annotations.Nullable; import java.security.InvalidKeyException; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandlerTest.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandlerTest.java index 1eab31290203..756c6680cfb3 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandlerTest.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandlerTest.java @@ -36,7 +36,7 @@ import com.hedera.hapi.node.scheduled.SchedulableTransactionBody.DataOneOfType; import com.hedera.hapi.node.state.schedule.Schedule; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.schedule.WritableScheduleStore; import com.hedera.node.app.service.schedule.impl.ScheduledTransactionFactory; import com.hedera.node.app.signature.impl.SignatureVerificationImpl; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandlerTest.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandlerTest.java index a96cb4244b90..f932d6119e97 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandlerTest.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandlerTest.java @@ -27,7 +27,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.ScheduleDeleteTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.signature.impl.SignatureVerificationImpl; import com.hedera.node.app.spi.fixtures.Assertions; import com.hedera.node.app.spi.signatures.VerificationAssistant; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandlerTest.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandlerTest.java index 386d55af66e6..537a14a85457 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandlerTest.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandlerTest.java @@ -25,7 +25,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.ScheduleSignTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.fixtures.Assertions; import com.hedera.node.app.spi.key.KeyComparator; import com.hedera.node.app.spi.signatures.VerificationAssistant; diff --git a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ExecutableTxn.java b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ExecutableTxn.java index f23701a735fd..159e32a53d7b 100644 --- a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ExecutableTxn.java +++ b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ExecutableTxn.java @@ -18,7 +18,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.record.StreamBuilder; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Instant; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/DispatchGasCalculator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/DispatchGasCalculator.java index bf3d8638f879..0a2fc9f515f7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/DispatchGasCalculator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/DispatchGasCalculator.java @@ -17,7 +17,7 @@ package com.hedera.node.app.service.contract.impl.exec.gas; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.hevm.HederaWorldUpdater.Enhancement; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/SystemContractGasCalculator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/SystemContractGasCalculator.java index a14475a5b40e..763e5cde4778 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/SystemContractGasCalculator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/SystemContractGasCalculator.java @@ -20,7 +20,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.function.ToLongBiFunction; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaNativeOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaNativeOperations.java index 697b53cff698..9ef344adbc56 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaNativeOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaNativeOperations.java @@ -28,7 +28,7 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.annotations.TransactionScope; import com.hedera.node.app.service.schedule.ReadableScheduleStore; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaOperations.java index 8b47680ccf4f..d2fd5225b76d 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaOperations.java @@ -40,7 +40,7 @@ import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.annotations.TransactionScope; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.TinybarValues; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleSystemContractOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleSystemContractOperations.java index 44408067bfee..4c5b78673a52 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleSystemContractOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleSystemContractOperations.java @@ -32,7 +32,7 @@ import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.ExchangeRate; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.annotations.TransactionScope; import com.hedera.node.app.service.contract.impl.records.ContractCallStreamBuilder; import com.hedera.node.app.spi.workflows.DispatchOptions.StakingRewards; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/QuerySystemContractOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/QuerySystemContractOperations.java index 4de48d3ed628..bab457723702 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/QuerySystemContractOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/QuerySystemContractOperations.java @@ -26,7 +26,7 @@ import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.ExchangeRate; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.annotations.QueryScope; import com.hedera.node.app.service.contract.impl.records.ContractCallStreamBuilder; import com.hedera.node.app.spi.workflows.DispatchOptions.UsePresetTxnId; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/SystemContractOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/SystemContractOperations.java index a962f0dc0c58..2db9ff1d47b7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/SystemContractOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/SystemContractOperations.java @@ -26,7 +26,7 @@ import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.ExchangeRate; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.records.ContractCallStreamBuilder; import com.hedera.node.app.spi.workflows.DispatchOptions.UsePresetTxnId; import com.hedera.node.app.spi.workflows.record.StreamBuilder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/PrngSystemContract.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/PrngSystemContract.java index b6421a1af759..fa01521cdae8 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/PrngSystemContract.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/PrngSystemContract.java @@ -30,7 +30,7 @@ import com.hedera.hapi.node.base.ContractID; import com.hedera.hapi.node.contract.ContractFunctionResult; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.util.UtilPrngTransactionBody; import com.hedera.node.app.hapi.utils.InvalidTransactionException; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveCall.java index a08d4741c638..8335e8850e3f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveCall.java @@ -22,7 +22,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveTranslator.java index d02d21909d61..92f0e8416260 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveTranslator.java @@ -22,7 +22,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.token.CryptoAllowance; import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.Call; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.HasCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCall.java index 92308199bf3c..9367835994ef 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCall.java @@ -21,7 +21,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsTranslator.java index 4c289164d8b0..e5ed2f26737a 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsTranslator.java @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.Call; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.HasCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/DispatchForResponseCodeHssCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/DispatchForResponseCodeHssCall.java index 0f35689962a3..ca229467023f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/DispatchForResponseCodeHssCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/DispatchForResponseCodeHssCall.java @@ -27,7 +27,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeCall.java index 96a3d6768227..27fea705bec1 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeCall.java @@ -29,7 +29,7 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.scheduled.ScheduleCreateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslator.java index 059e745e9c41..fecbe9aaf444 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslator.java @@ -27,7 +27,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/signschedule/SignScheduleTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/signschedule/SignScheduleTranslator.java index 33e357e5713d..03adf08572cd 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/signschedule/SignScheduleTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/signschedule/SignScheduleTranslator.java @@ -35,7 +35,7 @@ import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.scheduled.ScheduleSignTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AddressIdConverter.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AddressIdConverter.java index cc8707987d76..25d936e68012 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AddressIdConverter.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AddressIdConverter.java @@ -27,7 +27,7 @@ */ public interface AddressIdConverter { /** - * Given an address to be referenced in a synthetic {@link com.hedera.hapi.node.transaction.TransactionBody}, + * Given an address to be referenced in a synthetic {@link com.hedera.hapi.node.base.TransactionBody}, * returns the {@link AccountID} that should be used in the synthetic transaction. * * @param address the address to be used in the synthetic transaction @@ -37,7 +37,7 @@ public interface AddressIdConverter { AccountID convert(@NonNull Address address); /** - * Given a Besu sender address to be referenced in a synthetic {@link com.hedera.hapi.node.transaction.TransactionBody}, + * Given a Besu sender address to be referenced in a synthetic {@link com.hedera.hapi.node.base.TransactionBody}, * returns the {@link AccountID} that should be used in the synthetic transaction. * * @param address the address to be used in the synthetic transaction diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/DispatchForResponseCodeHtsCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/DispatchForResponseCodeHtsCall.java index c52f1abb3594..be82f9c22508 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/DispatchForResponseCodeHtsCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/DispatchForResponseCodeHtsCall.java @@ -29,7 +29,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropDecoder.java index 0ec657739482..c10ee1b08ab9 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropDecoder.java @@ -26,7 +26,7 @@ import com.hedera.hapi.node.base.NftTransfer; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.token.TokenAirdropTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropTranslator.java index c0cb03b4afff..07e8646ce37c 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropTranslator.java @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsDecoder.java index 611399e188ed..3c75733150cc 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsDecoder.java @@ -22,7 +22,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; import com.hedera.hapi.node.token.TokenDissociateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsTranslator.java index a44cc64c4b14..791f59a2e9ec 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsTranslator.java @@ -18,7 +18,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnDecoder.java index 1071a56aeba7..7a53d12493da 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnDecoder.java @@ -26,7 +26,7 @@ import com.google.common.primitives.Longs; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.token.TokenBurnTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.DispatchForResponseCodeHtsCall; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnTranslator.java index 106d80a0c420..fdf1b64334f6 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnTranslator.java @@ -21,7 +21,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropDecoder.java index c684ac60dc82..5309cca03520 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropDecoder.java @@ -27,7 +27,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.esaulpaugh.headlong.abi.Tuple; import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.config.data.TokensConfig; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslator.java index 3515e354776e..7ac716d98c42 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslator.java @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropDecoder.java index 8071cedf201c..9054c592a483 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropDecoder.java @@ -27,7 +27,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.esaulpaugh.headlong.abi.Tuple; import com.hedera.hapi.node.token.TokenClaimAirdropTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.config.data.TokensConfig; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslator.java index 92ae61d762f5..b9e6df1974b5 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslator.java @@ -18,7 +18,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/ClassicCreatesCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/ClassicCreatesCall.java index 8b598e51441e..c460057ba7cd 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/ClassicCreatesCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/ClassicCreatesCall.java @@ -48,7 +48,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.token.TokenCreateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.ActiveContractVerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.scope.ActiveContractVerificationStrategy.UseTopLevelSigs; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoder.java index 3c517b5a2e6f..2624f219b099 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoder.java @@ -24,7 +24,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Duration; import com.hedera.hapi.node.token.TokenCreateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoderFunction.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoderFunction.java index 0d1d750f52ee..679316bf8ec1 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoderFunction.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoderFunction.java @@ -17,7 +17,7 @@ package com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.create; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateTranslator.java index 058906ddc1dd..09779f57dee6 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateTranslator.java @@ -29,7 +29,7 @@ import static com.hedera.node.app.hapi.utils.contracts.ParsingConstants.ROYALTY_FEE_V2; import com.esaulpaugh.headlong.abi.Function; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.config.data.ContractsConfig; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/delete/DeleteTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/delete/DeleteTranslator.java index cd764819e3a3..48a0a8e26e5b 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/delete/DeleteTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/delete/DeleteTranslator.java @@ -19,7 +19,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.token.TokenDeleteTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoder.java index 480ba781c508..8adfa1791f57 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoder.java @@ -19,7 +19,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.token.TokenFreezeAccountTransactionBody; import com.hedera.hapi.node.token.TokenUnfreezeAccountTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeTranslator.java index de0989201d0e..a9297d5b1707 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeTranslator.java @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/AbstractGrantApprovalCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/AbstractGrantApprovalCall.java index 9beb0f0d2bb7..f8887b7a7484 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/AbstractGrantApprovalCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/AbstractGrantApprovalCall.java @@ -28,7 +28,7 @@ import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.NftRemoveAllowance; import com.hedera.hapi.node.token.TokenAllowance; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoder.java index cad1ef4df9dd..05388e55e9a6 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoder.java @@ -21,7 +21,7 @@ import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalTranslator.java index 8892d642a519..a47d95d17d2a 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalTranslator.java @@ -22,7 +22,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoder.java index 60f8d10499f2..5ffa9f5dc5de 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoder.java @@ -21,7 +21,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.token.TokenGrantKycTransactionBody; import com.hedera.hapi.node.token.TokenRevokeKycTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycTranslator.java index 14db3f20a93e..546852778bbe 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycTranslator.java @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintDecoder.java index cef563649fc4..a0e322b8ab5a 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintDecoder.java @@ -19,7 +19,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.esaulpaugh.headlong.abi.TupleType; import com.hedera.hapi.node.token.TokenMintTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.DispatchForResponseCodeHtsCall; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintTranslator.java index 64a127958b57..579a2da86e29 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintTranslator.java @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesDecoder.java index 9b6d411ffcdf..613dd1b55342 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesDecoder.java @@ -21,7 +21,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.token.TokenPauseTransactionBody; import com.hedera.hapi.node.token.TokenUnpauseTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; import javax.inject.Inject; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesTranslator.java index 165e4b39a359..2ac759230909 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesTranslator.java @@ -18,7 +18,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensDecoder.java index 89893d03f56e..aa91ff0c9083 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensDecoder.java @@ -25,7 +25,7 @@ import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.token.TokenReference; import com.hedera.hapi.node.token.TokenRejectTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.config.data.LedgerConfig; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslator.java index b21bdb77d5b4..b07b05b802c0 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslator.java @@ -18,7 +18,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllCall.java index 73db13c9a56d..7d4461bc45d0 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllCall.java @@ -29,7 +29,7 @@ import com.esaulpaugh.headlong.abi.Tuple; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoder.java index 054331a5168e..a8060194b8b9 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoder.java @@ -22,7 +22,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllTranslator.java index 96e3fbb8ff7e..851e3b1fe132 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllTranslator.java @@ -18,7 +18,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersCall.java index a753e96bdea3..6127f5aeefe0 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersCall.java @@ -34,7 +34,7 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersDecoder.java index da7635a76dea..71ee62b0f036 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersDecoder.java @@ -28,7 +28,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.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersTranslator.java index bfee6100667c..bd57806af51b 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersTranslator.java @@ -22,7 +22,7 @@ import static com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.transfer.SystemAccountCreditScreen.SYSTEM_ACCOUNT_CREDIT_SCREEN; import com.esaulpaugh.headlong.abi.Function; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.ReturnTypes; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc20TransfersCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc20TransfersCall.java index da10fe7961b9..75d050453359 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc20TransfersCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc20TransfersCall.java @@ -34,7 +34,7 @@ import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc721TransferFromCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc721TransferFromCall.java index 7b58d3814f2a..dbb8ae7972a8 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc721TransferFromCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc721TransferFromCall.java @@ -32,7 +32,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoder.java index 119d176031da..9d212c9029f7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoder.java @@ -34,7 +34,7 @@ import com.hedera.hapi.node.token.TokenUpdateNftsTransactionBody; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; import com.hedera.hapi.node.token.TokenUpdateTransactionBody.Builder; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.DispatchForResponseCodeHtsCall; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoderFunction.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoderFunction.java index 15fb96902014..7b1acb8bc399 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoderFunction.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoderFunction.java @@ -16,7 +16,7 @@ package com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.update; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateExpiryTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateExpiryTranslator.java index 1d91cf22dce1..b71e2698f8d3 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateExpiryTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateExpiryTranslator.java @@ -22,7 +22,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateKeysTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateKeysTranslator.java index 3076a6a433d8..69750cea0a66 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateKeysTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateKeysTranslator.java @@ -22,7 +22,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateNFTsMetadataTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateNFTsMetadataTranslator.java index ada69222db8d..0baf1c29302c 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateNFTsMetadataTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateNFTsMetadataTranslator.java @@ -18,7 +18,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateTranslator.java index 162a449c5c59..ffbb27a6bab2 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateTranslator.java @@ -24,7 +24,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesDecoder.java index 7d746ee080ff..63e67372c26d 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesDecoder.java @@ -28,7 +28,7 @@ import com.hedera.hapi.node.transaction.FixedFee; import com.hedera.hapi.node.transaction.FractionalFee; import com.hedera.hapi.node.transaction.RoyaltyFee; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesTranslator.java index 75788816cfd1..6f70ed8e3942 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesTranslator.java @@ -22,7 +22,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeDecoder.java index fc46e7db6221..fcd3ccb0ee9e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeDecoder.java @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.token.TokenWipeAccountTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeTranslator.java index 9d7e43bfecc3..639ef79b5f40 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeTranslator.java @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/SchedulingUtility.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/SchedulingUtility.java index 10a295580877..c4a771214931 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/SchedulingUtility.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/SchedulingUtility.java @@ -18,7 +18,7 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.HandleException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/AbstractContractTransactionHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/AbstractContractTransactionHandler.java index f2ab8b4aeb79..df59d27ad1bb 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/AbstractContractTransactionHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/AbstractContractTransactionHandler.java @@ -22,7 +22,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.hapi.utils.fee.SmartContractFeeBuilder; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCallHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCallHandler.java index 33eaf3c5a5c8..06df4ebe5d6d 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCallHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCallHandler.java @@ -25,7 +25,7 @@ import static com.hedera.node.app.spi.workflows.PreCheckException.validateTruePreCheck; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.hapi.utils.fee.SmartContractFeeBuilder; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCreateHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCreateHandler.java index c5b05858dd09..192bf4af5b4e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCreateHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCreateHandler.java @@ -25,7 +25,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.hapi.utils.fee.SmartContractFeeBuilder; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractDeleteHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractDeleteHandler.java index 17d2b404a501..3d8b3f4956f6 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractDeleteHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractDeleteHandler.java @@ -37,7 +37,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.contract.ContractDeleteTransactionBody; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.fee.SmartContractFeeBuilder; import com.hedera.node.app.service.contract.impl.records.ContractDeleteStreamBuilder; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemDeleteHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemDeleteHandler.java index 8ec908ee22eb..f579c55cd73c 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemDeleteHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemDeleteHandler.java @@ -19,7 +19,7 @@ import static com.hedera.hapi.node.base.ResponseCodeEnum.NOT_SUPPORTED; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemUndeleteHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemUndeleteHandler.java index efac49e6a10e..6648575936a5 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemUndeleteHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemUndeleteHandler.java @@ -19,7 +19,7 @@ import static com.hedera.hapi.node.base.ResponseCodeEnum.NOT_SUPPORTED; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractUpdateHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractUpdateHandler.java index 3c4fd2ce2a6e..021938e4a46f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractUpdateHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractUpdateHandler.java @@ -42,7 +42,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.contract.ContractUpdateTransactionBody; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.hapi.utils.fee.SmartContractFeeBuilder; import com.hedera.node.app.service.contract.impl.records.ContractUpdateStreamBuilder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/EthereumTransactionHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/EthereumTransactionHandler.java index f93e8e890cac..f3042ea02029 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/EthereumTransactionHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/EthereumTransactionHandler.java @@ -34,7 +34,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.contract.EthereumTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxSigs; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; import com.hedera.node.app.service.contract.impl.exec.TransactionComponent; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/infra/HevmTransactionFactory.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/infra/HevmTransactionFactory.java index df8a14f84f01..a795e98cf11f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/infra/HevmTransactionFactory.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/infra/HevmTransactionFactory.java @@ -56,7 +56,7 @@ import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.service.contract.impl.ContractServiceImpl; import com.hedera.node.app.service.contract.impl.annotations.InitialState; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/TestHelpers.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/TestHelpers.java index 33a52cd25061..4581ea84ef1e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/TestHelpers.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/TestHelpers.java @@ -65,7 +65,7 @@ import com.hedera.hapi.node.transaction.FixedFee; import com.hedera.hapi.node.transaction.FractionalFee; import com.hedera.hapi.node.transaction.RoyaltyFee; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.streams.CallOperationType; import com.hedera.hapi.streams.ContractAction; import com.hedera.hapi.streams.ContractActionType; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/ContextTransactionProcessorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/ContextTransactionProcessorTest.java index ef6b5d29663b..43167a5dc3b3 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/ContextTransactionProcessorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/ContextTransactionProcessorTest.java @@ -40,7 +40,7 @@ import com.hedera.hapi.node.base.TimestampSeconds; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.ExchangeRate; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.CallOutcome; import com.hedera.node.app.service.contract.impl.exec.ContextTransactionProcessor; import com.hedera.node.app.service.contract.impl.exec.TransactionProcessor; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/QueryModuleTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/QueryModuleTest.java index 2be8f73c4ede..5f5b019b7ffb 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/QueryModuleTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/QueryModuleTest.java @@ -24,7 +24,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.QueryModule; import com.hedera.node.app.service.contract.impl.exec.gas.CanonicalDispatchPrices; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/TransactionModuleTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/TransactionModuleTest.java index 3e61a422583d..0312ccb66f5b 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/TransactionModuleTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/TransactionModuleTest.java @@ -38,7 +38,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxSigs; import com.hedera.node.app.service.contract.impl.exec.FeatureFlags; import com.hedera.node.app.service.contract.impl.exec.TransactionModule; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/gas/SystemContractGasCalculatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/gas/SystemContractGasCalculatorTest.java index ae99e7c9f3c6..8f3f07c1e99d 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/gas/SystemContractGasCalculatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/gas/SystemContractGasCalculatorTest.java @@ -20,7 +20,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.CanonicalDispatchPrices; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaNativeOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaNativeOperationsTest.java index c4bf09d6bcb9..6cd24cc55c44 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaNativeOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaNativeOperationsTest.java @@ -55,7 +55,7 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HandleHederaNativeOperations; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaOperationsTest.java index 35718a0e1b51..0f528123fcdb 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaOperationsTest.java @@ -60,7 +60,7 @@ import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.token.TokenCreateTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.TinybarValues; import com.hedera.node.app.service.contract.impl.exec.scope.HandleHederaOperations; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java index 467bc9112bf7..92245b5d38f1 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java @@ -41,7 +41,7 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.base.TransactionID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HandleSystemContractOperations; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy.Decision; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/QuerySystemContractOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/QuerySystemContractOperationsTest.java index 4d718812be79..521bab6ee410 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/QuerySystemContractOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/QuerySystemContractOperationsTest.java @@ -33,7 +33,7 @@ import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.ExchangeRate; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.QuerySystemContractOperations; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.spi.fees.ExchangeRateInfo; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/hbarApprove/HbarApproveCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/hbarApprove/HbarApproveCallTest.java index 4740df626a35..2cf7f7b97b04 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/hbarApprove/HbarApproveCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/hbarApprove/HbarApproveCallTest.java @@ -25,7 +25,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.HasCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.hbarapprove.HbarApproveCall; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.hbarapprove.HbarApproveTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCallTest.java index eecc6b8b1d38..4a914aeb44d6 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCallTest.java @@ -23,7 +23,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.HasCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.setunlimitedautoassociations.SetUnlimitedAutoAssociationsCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/DispatchForResponseCodeHssCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/DispatchForResponseCodeHssCallTest.java index 03ec2959a90f..b945bae4d0e7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/DispatchForResponseCodeHssCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/DispatchForResponseCodeHssCallTest.java @@ -28,7 +28,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hss.DispatchForResponseCodeHssCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslatorTest.java index 4b18bd35968e..e1a13b321060 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslatorTest.java @@ -34,7 +34,7 @@ import static org.mockito.Mockito.any; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategies; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/signschedule/SignScheduleTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/signschedule/SignScheduleTranslatorTest.java index 2f079980c019..2527ef9da78e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/signschedule/SignScheduleTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/signschedule/SignScheduleTranslatorTest.java @@ -42,7 +42,7 @@ import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.SignaturePair; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/DispatchForResponseCodeHtsCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/DispatchForResponseCodeHtsCallTest.java index edd1c6e2d718..fa4523884802 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/DispatchForResponseCodeHtsCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/DispatchForResponseCodeHtsCallTest.java @@ -33,7 +33,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.token.TokenCreateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.DispatchForResponseCodeHtsCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/HtsCallAttemptTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/HtsCallAttemptTest.java index cbaefda4b7d7..df905958407f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/HtsCallAttemptTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/HtsCallAttemptTest.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.verifyNoInteractions; import com.hedera.hapi.node.token.TokenMintTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategies; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.CallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/airdrops/TokenAirdropTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/airdrops/TokenAirdropTranslatorTest.java index cd1d0d159f05..71e9a1d8b1ea 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/airdrops/TokenAirdropTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/airdrops/TokenAirdropTranslatorTest.java @@ -28,7 +28,7 @@ import static org.mockito.Mockito.when; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategies; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsDecoderTest.java index a9cfb9b0396e..092821ea048d 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsDecoderTest.java @@ -28,7 +28,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.associations.AssociationsDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsTranslatorTest.java index cb7f59f664a8..7f6189820de5 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsTranslatorTest.java @@ -20,7 +20,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.associations.AssociationsTranslator; import com.hedera.node.app.service.contract.impl.test.exec.systemcontracts.common.CallTestBase; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslatorTest.java index 26568e3d7d0a..eb86e4a9b8bb 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslatorTest.java @@ -28,7 +28,7 @@ import static org.mockito.Mockito.verify; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslatorTest.java index ee5655def64e..b0a99541d7e1 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslatorTest.java @@ -29,7 +29,7 @@ import static org.mockito.Mockito.when; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java index 7c6556623659..927249842b92 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java @@ -40,7 +40,7 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.token.TokenCreateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.create.ClassicCreatesCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/CreateDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/CreateDecoderTest.java index c3789f3e495f..4fc2d6f222bb 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/CreateDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/CreateDecoderTest.java @@ -47,7 +47,7 @@ import com.hedera.hapi.node.base.TokenType; import com.hedera.hapi.node.transaction.CustomFee; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.create.CreateDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoderTest.java index 10310e9bffda..071e1b88ab3b 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoderTest.java @@ -26,7 +26,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.freeze.FreezeUnfreezeDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java index 9a3e3084f9ee..46b3a52a28f0 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java @@ -38,7 +38,7 @@ import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.state.token.Token; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.grantapproval.ERCGrantApprovalCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoderTest.java index aa77365b3a5f..2537d0a7c3c8 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoderTest.java @@ -29,7 +29,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.grantapproval.GrantApprovalDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoderTest.java index 4006ad9c32a4..bb4615e03b97 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoderTest.java @@ -22,7 +22,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.grantrevokekyc.GrantRevokeKycDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/pauses/PausesDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/pauses/PausesDecoderTest.java index e3f0c4c654a4..c95ea1d0bfe1 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/pauses/PausesDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/pauses/PausesDecoderTest.java @@ -23,7 +23,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.pauses.PausesDecoder; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.pauses.PausesTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslatorTest.java index 62036e369899..1d8d99731024 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslatorTest.java @@ -31,7 +31,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.token.TokenReference; import com.hedera.hapi.node.token.TokenRejectTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllCallTest.java index 38afe338b000..9ebcb4847357 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllCallTest.java @@ -27,7 +27,7 @@ import com.esaulpaugh.headlong.abi.Tuple; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoderTest.java index 8b5065502713..75eb5f47e77d 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoderTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.setapproval.SetApprovalForAllDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersCallTest.java index 4cc0b4a81274..179a6b54ff69 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersCallTest.java @@ -38,7 +38,7 @@ import com.esaulpaugh.headlong.abi.TupleType; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.failure.CustomExceptionalHaltReason; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersDecoderTest.java index 2a6ffd7471d2..d3072bc9c6e1 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersDecoderTest.java @@ -25,7 +25,7 @@ import com.esaulpaugh.headlong.abi.Tuple; import com.hedera.hapi.node.base.AccountAmount; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.transfer.ClassicTransfersDecoder; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.transfer.ClassicTransfersTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersGasCalcTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersGasCalcTest.java index 4790c2f22cc5..6f221090ce14 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersGasCalcTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersGasCalcTest.java @@ -25,7 +25,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.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.transfer.ClassicTransfersCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc20TransfersCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc20TransfersCallTest.java index 2ee62b48b0f8..106bc7652786 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc20TransfersCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc20TransfersCallTest.java @@ -37,7 +37,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc721TransferFromCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc721TransferFromCallTest.java index 36c97405e53d..ff0b5255b535 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc721TransferFromCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc721TransferFromCallTest.java @@ -32,7 +32,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.transfer.Erc721TransferFromCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/update/UpdateTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/update/UpdateTranslatorTest.java index 13d92969da66..e4b8813ee8d5 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/update/UpdateTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/update/UpdateTranslatorTest.java @@ -45,7 +45,7 @@ import com.esaulpaugh.headlong.abi.Tuple; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategies; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCallHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCallHandlerTest.java index 5d22d1890543..100b30bc0091 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCallHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCallHandlerTest.java @@ -31,7 +31,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; import com.hedera.node.app.service.contract.impl.exec.CallOutcome; import com.hedera.node.app.service.contract.impl.exec.ContextTransactionProcessor; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCreateHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCreateHandlerTest.java index 75b78bdc1136..ae597caeeff4 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCreateHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCreateHandlerTest.java @@ -35,7 +35,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; import com.hedera.node.app.service.contract.impl.exec.CallOutcome; import com.hedera.node.app.service.contract.impl.exec.ContextTransactionProcessor; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractDeleteHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractDeleteHandlerTest.java index faaa32bc8593..009e5d7ea8ac 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractDeleteHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractDeleteHandlerTest.java @@ -41,7 +41,7 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.contract.ContractDeleteTransactionBody; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.handlers.ContractDeleteHandler; import com.hedera.node.app.service.contract.impl.records.ContractDeleteStreamBuilder; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractUpdateHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractUpdateHandlerTest.java index f69b5471868c..73b12a1b127f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractUpdateHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractUpdateHandlerTest.java @@ -56,7 +56,7 @@ import com.hedera.hapi.node.contract.ContractUpdateTransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Account.Builder; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.handlers.ContractUpdateHandler; import com.hedera.node.app.service.contract.impl.records.ContractUpdateStreamBuilder; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/EthereumTransactionHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/EthereumTransactionHandlerTest.java index c87e79f5ed42..4d87613b6d40 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/EthereumTransactionHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/EthereumTransactionHandlerTest.java @@ -40,7 +40,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.EthereumTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; import com.hedera.node.app.service.contract.impl.exec.CallOutcome; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java index c862f9d62dc7..e4f03867b87a 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java @@ -35,7 +35,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallLocalQuery; import com.hedera.hapi.node.transaction.Query; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.infra.HevmStaticTransactionFactory; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.HandleException; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmTransactionFactoryTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmTransactionFactoryTest.java index c8c343cb5794..af88f7277aa7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmTransactionFactoryTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmTransactionFactoryTest.java @@ -86,7 +86,7 @@ import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; import com.hedera.hapi.node.state.file.File; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.hapi.utils.ethereum.EthTxSigs; import com.hedera.node.app.service.contract.impl.exec.FeatureFlags; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/CryptoSignatureWaiversImpl.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/CryptoSignatureWaiversImpl.java index e8f4b556a01d..39e4055827cd 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/CryptoSignatureWaiversImpl.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/CryptoSignatureWaiversImpl.java @@ -20,7 +20,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.CryptoSignatureWaivers; import com.hedera.node.app.service.token.TokenService; import com.hedera.node.app.spi.authorization.Authorizer; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoAddLiveHashHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoAddLiveHashHandler.java index 33cbf367e474..f92b53f4725e 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoAddLiveHashHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoAddLiveHashHandler.java @@ -20,7 +20,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoApproveAllowanceHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoApproveAllowanceHandler.java index 51a843f38b09..60cc80f48fec 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoApproveAllowanceHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoApproveAllowanceHandler.java @@ -52,7 +52,7 @@ import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java index 1024b86ec40d..3e2f05612174 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java @@ -68,7 +68,7 @@ import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteAllowanceHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteAllowanceHandler.java index 78812d9b856c..484c2db4fac2 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteAllowanceHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteAllowanceHandler.java @@ -37,7 +37,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.NftRemoveAllowance; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteHandler.java index 71058d3b9de1..1db4f1799c66 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteHandler.java @@ -25,7 +25,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.CryptoFeeBuilder; import com.hedera.node.app.service.token.api.TokenServiceApi; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteLiveHashHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteLiveHashHandler.java index 09a2ce8caf6c..9eb2e0dbd737 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteLiveHashHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteLiveHashHandler.java @@ -20,7 +20,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.HandleContext; import com.hedera.node.app.spi.workflows.HandleException; import com.hedera.node.app.spi.workflows.PreCheckException; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferHandler.java index 5565a7edd2c6..463371c1852f 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferHandler.java @@ -45,7 +45,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.AssessedCustomFee; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoUpdateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoUpdateHandler.java index 4cd8e94db1f7..c6bd46cac324 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoUpdateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoUpdateHandler.java @@ -50,7 +50,7 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.CryptoSignatureWaivers; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAccountWipeHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAccountWipeHandler.java index 63c9074cff55..b389afd39df5 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAccountWipeHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAccountWipeHandler.java @@ -40,7 +40,7 @@ import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAirdropHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAirdropHandler.java index 6c40d1b10d3c..8abf1930981f 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAirdropHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAirdropHandler.java @@ -49,7 +49,7 @@ import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.AccountPendingAirdrop; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAirdropStore; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAssociateToAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAssociateToAccountHandler.java index 288a1577a1b2..4911299c330b 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAssociateToAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAssociateToAccountHandler.java @@ -38,7 +38,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.TxnUsageEstimator; import com.hedera.node.app.hapi.fees.usage.token.TokenAssociateUsage; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenBurnHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenBurnHandler.java index 2c8ad612ef74..ae47f3a44695 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenBurnHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenBurnHandler.java @@ -37,7 +37,7 @@ import com.hedera.hapi.node.base.TokenType; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableTokenRelationStore; import com.hedera.node.app.service.token.ReadableTokenStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCancelAirdropHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCancelAirdropHandler.java index 17593f449f9a..e85d5f934a2c 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCancelAirdropHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCancelAirdropHandler.java @@ -38,7 +38,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableAirdropStore; import com.hedera.node.app.service.token.impl.util.PendingAirdropUpdater; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenClaimAirdropHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenClaimAirdropHandler.java index 59059b4233d1..0d91f728343e 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenClaimAirdropHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenClaimAirdropHandler.java @@ -39,7 +39,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.token.TokenClaimAirdropTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableAirdropStore; import com.hedera.node.app.service.token.ReadableTokenStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCreateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCreateHandler.java index 7f464a7c8cc1..6eca6a713ece 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCreateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCreateHandler.java @@ -37,7 +37,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenCreateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDeleteHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDeleteHandler.java index bdc62f157e74..dac135e1e657 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDeleteHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDeleteHandler.java @@ -28,7 +28,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.state.token.Token; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenDeleteUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDissociateFromAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDissociateFromAccountHandler.java index f1954d52c143..8fc8afffb0bf 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDissociateFromAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDissociateFromAccountHandler.java @@ -44,7 +44,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenDissociateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenDissociateUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFeeScheduleUpdateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFeeScheduleUpdateHandler.java index 8363fc4e08fd..33e639a2e20a 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFeeScheduleUpdateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFeeScheduleUpdateHandler.java @@ -34,7 +34,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenFeeScheduleUpdateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.token.TokenOpsUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFreezeAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFreezeAccountHandler.java index cf0f278d802d..cbab302a8642 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFreezeAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFreezeAccountHandler.java @@ -29,7 +29,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenFreezeAccountTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenGrantKycToAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenGrantKycToAccountHandler.java index 54b78dcde816..ce9c583a5e33 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenGrantKycToAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenGrantKycToAccountHandler.java @@ -29,7 +29,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.state.token.TokenRelation; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenGrantKycUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenMintHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenMintHandler.java index 75c467ff1324..b3a98416949f 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenMintHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenMintHandler.java @@ -45,7 +45,7 @@ import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenPauseHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenPauseHandler.java index 9245b14bb260..daef0725d9fb 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenPauseHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenPauseHandler.java @@ -27,7 +27,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenStore; import com.hedera.node.app.service.token.records.TokenBaseStreamBuilder; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRejectHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRejectHandler.java index b2023d0319eb..8bd4dd42f37a 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRejectHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRejectHandler.java @@ -55,7 +55,7 @@ import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.TokenReference; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRevokeKycFromAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRevokeKycFromAccountHandler.java index 00dccfc3ea40..7c4a7efb350e 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRevokeKycFromAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRevokeKycFromAccountHandler.java @@ -29,7 +29,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.state.token.TokenRelation; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenRevokeKycUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnfreezeAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnfreezeAccountHandler.java index 5874abefbd61..ea8d55bad665 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnfreezeAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnfreezeAccountHandler.java @@ -30,7 +30,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUnfreezeAccountTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnpauseHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnpauseHandler.java index 2b2b8ef65bad..6272eb03b98b 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnpauseHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnpauseHandler.java @@ -25,7 +25,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenStore; import com.hedera.node.app.service.token.records.TokenBaseStreamBuilder; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateHandler.java index 8977c733730a..85ad4c7a14ba 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateHandler.java @@ -49,7 +49,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenUpdateUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateNftsHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateNftsHandler.java index a10aa781d0f1..41125276363f 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateNftsHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateNftsHandler.java @@ -33,7 +33,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.token.TokenUpdateNftsTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableNftStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/staking/EndOfStakingPeriodUtils.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/staking/EndOfStakingPeriodUtils.java index 7af69ae8e48c..08ea3e8fee54 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/staking/EndOfStakingPeriodUtils.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/staking/EndOfStakingPeriodUtils.java @@ -25,7 +25,7 @@ import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.transaction.NodeStake; import com.hedera.hapi.node.transaction.NodeStakeUpdateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableNetworkStakingRewardsStore; import com.hedera.node.config.data.StakingConfig; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AssociateTokenRecipientsStep.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AssociateTokenRecipientsStep.java index a25f1b988b38..475c8b5104d1 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AssociateTokenRecipientsStep.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AssociateTokenRecipientsStep.java @@ -41,7 +41,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AutoAccountCreator.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AutoAccountCreator.java index 244755a41ef7..55d2a8950a82 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AutoAccountCreator.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AutoAccountCreator.java @@ -32,7 +32,7 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.records.CryptoCreateStreamBuilder; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/TransferExecutor.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/TransferExecutor.java index 3d65ad1f8729..04b3e9d95ff4 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/TransferExecutor.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/TransferExecutor.java @@ -37,7 +37,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.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.handlers.BaseTokenHandler; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/CryptoSignatureWaiversImplTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/CryptoSignatureWaiversImplTest.java index e4eed05357fd..3c730667d60d 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/CryptoSignatureWaiversImplTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/CryptoSignatureWaiversImplTest.java @@ -23,7 +23,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.authorization.AuthorizerImpl; import com.hedera.node.app.authorization.PrivilegesVerifier; import com.hedera.node.app.service.token.impl.CryptoSignatureWaiversImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoAddLiveHashHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoAddLiveHashHandlerTest.java index 58ad0c63cb8b..e3610f3e23bf 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoAddLiveHashHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoAddLiveHashHandlerTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mock.Strictness.LENIENT; import static org.mockito.Mockito.mock; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.CryptoAddLiveHashHandler; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoApproveAllowanceHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoApproveAllowanceHandlerTest.java index 6e0761ffbe7c..607cea5cc6a0 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoApproveAllowanceHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoApproveAllowanceHandlerTest.java @@ -48,7 +48,7 @@ import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.ReadableAccountStoreImpl; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoCreateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoCreateHandlerTest.java index e20e28b0f47e..3dd2e01adb5b 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoCreateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoCreateHandlerTest.java @@ -65,7 +65,7 @@ import com.hedera.hapi.node.state.primitives.ProtoBytes; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.handlers.CryptoCreateHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoHandlerTestBase; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteAllowanceHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteAllowanceHandlerTest.java index 37b5bfc6f409..d05630caf533 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteAllowanceHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteAllowanceHandlerTest.java @@ -37,7 +37,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoDeleteAllowanceTransactionBody; import com.hedera.hapi.node.token.NftRemoveAllowance; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.CryptoDeleteAllowanceHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; import com.hedera.node.app.service.token.impl.validators.DeleteAllowanceValidator; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteHandlerTest.java index 7dbcbf852234..ef010aa14678 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteHandlerTest.java @@ -48,7 +48,7 @@ import com.hedera.hapi.node.state.primitives.ProtoBytes; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoDeleteTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.api.TokenServiceApi; import com.hedera.node.app.service.token.impl.ReadableAccountStoreImpl; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerPureChecksTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerPureChecksTest.java index 141bd3140373..75e3dc3f8588 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerPureChecksTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerPureChecksTest.java @@ -31,7 +31,7 @@ import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.pbj.runtime.io.buffer.Bytes; import java.util.Collections; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTest.java index f222d2cb7dcc..5d736773db0d 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTest.java @@ -54,7 +54,7 @@ import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTestBase.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTestBase.java index 2eff004da9a0..f6744af0e5f7 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTestBase.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTestBase.java @@ -32,7 +32,7 @@ import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.token.TokenAirdropTransactionBody; import com.hedera.hapi.node.token.TokenClaimAirdropTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.CryptoTransferHandler; import com.hedera.node.app.service.token.impl.handlers.TokenAirdropHandler; import com.hedera.node.app.service.token.impl.handlers.TokenClaimAirdropHandler; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java index b329d963c734..01c0936132d0 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java @@ -60,7 +60,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.CryptoSignatureWaiversImpl; import com.hedera.node.app.service.token.impl.ReadableAccountStoreImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAccountWipeHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAccountWipeHandlerTest.java index 790b0a5524c7..0ed820bab7c5 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAccountWipeHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAccountWipeHandlerTest.java @@ -56,7 +56,7 @@ import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenBurnTransactionBody; import com.hedera.hapi.node.token.TokenWipeAccountTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAirdropHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAirdropHandlerTest.java index 284cf83cb0fd..660c2dfc1929 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAirdropHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAirdropHandlerTest.java @@ -49,7 +49,7 @@ import com.hedera.hapi.node.state.token.AccountPendingAirdrop; import com.hedera.hapi.node.token.TokenAirdropTransactionBody; import com.hedera.hapi.node.transaction.PendingAirdropRecord; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.FeeContextImpl; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAirdropStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAssociateToAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAssociateToAccountHandlerTest.java index 22bcb3d20355..d6155eb58258 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAssociateToAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAssociateToAccountHandlerTest.java @@ -50,7 +50,7 @@ import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenBurnHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenBurnHandlerTest.java index 264b2c645bbb..50afd534b407 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenBurnHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenBurnHandlerTest.java @@ -62,7 +62,7 @@ import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; import com.hedera.hapi.node.token.TokenBurnTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerPureChecksTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerPureChecksTest.java index fffd7e660925..bd613d107648 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerPureChecksTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerPureChecksTest.java @@ -33,7 +33,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.TokenCancelAirdropHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; import com.hedera.node.app.service.token.impl.util.PendingAirdropUpdater; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerTest.java index 3f5dd0ca0dc2..a9502419b01e 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerTest.java @@ -37,7 +37,7 @@ import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableAirdropStore; import com.hedera.node.app.service.token.impl.handlers.TokenCancelAirdropHandler; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java index 6041da642e0e..86fa57911186 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java @@ -69,7 +69,7 @@ import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenCreateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.handlers.TokenCreateHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; @@ -858,7 +858,7 @@ void failsForInvalidMetaDataKey() { /* --------------------------------- Helpers */ /** - * A builder for {@link com.hedera.hapi.node.transaction.TransactionBody} instances. + * A builder for {@link com.hedera.hapi.node.base.TransactionBody} instances. */ private class TokenCreateBuilder { private AccountID payer = payerId; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDeleteHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDeleteHandlerTest.java index eb70327d002b..d50f9fcafe07 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDeleteHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDeleteHandlerTest.java @@ -33,7 +33,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenDeleteTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableTokenStore; import com.hedera.node.app.service.token.impl.handlers.BaseCryptoHandler; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDissociateFromAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDissociateFromAccountHandlerTest.java index 7a839931a42e..758abd9a9f35 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDissociateFromAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDissociateFromAccountHandlerTest.java @@ -49,7 +49,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenDissociateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFeeScheduleUpdateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFeeScheduleUpdateHandlerTest.java index e22ccbe3c5c8..e6ba33856f68 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFeeScheduleUpdateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFeeScheduleUpdateHandlerTest.java @@ -41,7 +41,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenFeeScheduleUpdateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.FeeContextImpl; import com.hedera.node.app.fees.FeeManager; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFreezeAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFreezeAccountHandlerTest.java index 17eaed27a331..7132d14270c3 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFreezeAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFreezeAccountHandlerTest.java @@ -44,7 +44,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenFreezeAccountTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenGrantKycToAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenGrantKycToAccountHandlerTest.java index e3a81b5f75d3..8c5f694905a1 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenGrantKycToAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenGrantKycToAccountHandlerTest.java @@ -42,7 +42,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenGrantKycTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.ReadableTokenStoreImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java index 3fd3e1834580..a27af9e0ac72 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java @@ -42,7 +42,7 @@ import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.TokenMintTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.handlers.TokenMintHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenPauseHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenPauseHandlerTest.java index 6a551d95cf32..7058f7b68e54 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenPauseHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenPauseHandlerTest.java @@ -40,7 +40,7 @@ import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenPauseTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.ReadableTokenStoreImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRejectHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRejectHandlerTest.java index 7d8d90d1e049..aaac9036dcf5 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRejectHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRejectHandlerTest.java @@ -39,7 +39,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.TokenReference; import com.hedera.hapi.node.token.TokenRejectTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.FeeContextImpl; import com.hedera.node.app.service.token.impl.handlers.TokenRejectHandler; import com.hedera.node.app.spi.fees.FeeCalculator; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRevokeKycFromAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRevokeKycFromAccountHandlerTest.java index 62aa84820992..6e41529c033e 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRevokeKycFromAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRevokeKycFromAccountHandlerTest.java @@ -42,7 +42,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenRevokeKycTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnfreezeAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnfreezeAccountHandlerTest.java index 281924151843..0d7418ad513a 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnfreezeAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnfreezeAccountHandlerTest.java @@ -44,7 +44,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUnfreezeAccountTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnpauseHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnpauseHandlerTest.java index fcb5a593ebbf..a52882809426 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnpauseHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnpauseHandlerTest.java @@ -39,7 +39,7 @@ import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenUnpauseTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.ReadableTokenStoreImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateHandlerTest.java index 3203980bafe2..1310ae54b91d 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateHandlerTest.java @@ -70,7 +70,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; import com.hedera.node.app.service.token.ReadableTokenStore; @@ -1214,7 +1214,7 @@ void validateZeroTreasuryIsUpdatedForHapiCalls() { /* --------------------------------- Helpers --------------------------------- */ /** - * A builder for {@link com.hedera.hapi.node.transaction.TransactionBody} instances. + * A builder for {@link com.hedera.hapi.node.base.TransactionBody} instances. */ private class TokenUpdateBuilder { private AccountID payer = payerId; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateNftsHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateNftsHandlerTest.java index de9c5f9911b9..827195007f4e 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateNftsHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateNftsHandlerTest.java @@ -47,7 +47,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUpdateNftsTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/EndOfStakingPeriodUpdaterTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/EndOfStakingPeriodUpdaterTest.java index 86ffbdbd2f7f..ffca84d412d3 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/EndOfStakingPeriodUpdaterTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/EndOfStakingPeriodUpdaterTest.java @@ -38,7 +38,7 @@ import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableNetworkStakingRewardsStore; import com.hedera.node.app.service.token.impl.WritableStakingInfoStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/StakeInfoHelperTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/StakeInfoHelperTest.java index 9fa8e815cb4d..980eb22f69ae 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/StakeInfoHelperTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/StakeInfoHelperTest.java @@ -37,7 +37,7 @@ import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableNetworkStakingRewardsStore; import com.hedera.node.app.service.token.impl.WritableStakingInfoStore; import com.hedera.node.app.service.token.impl.handlers.staking.StakeInfoHelper; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/StepsBase.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/StepsBase.java index 2f05546bd17f..80e1b7a2bf44 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/StepsBase.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/StepsBase.java @@ -37,7 +37,7 @@ import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.token.TokenAirdropTransactionBody; import com.hedera.hapi.node.token.TokenClaimAirdropTransactionBody; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.handlers.transfer.AdjustFungibleTokenChangesStep; import com.hedera.node.app.service.token.impl.handlers.transfer.AdjustHbarChangesStep; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/ApproveAllowanceValidatorTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/ApproveAllowanceValidatorTest.java index 4ae4384d7f30..6a08ef460c45 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/ApproveAllowanceValidatorTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/ApproveAllowanceValidatorTest.java @@ -32,7 +32,7 @@ import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; import com.hedera.node.app.service.token.impl.validators.ApproveAllowanceValidator; import com.hedera.node.app.spi.validation.ExpiryValidator; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/DeleteAllowanceValidatorTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/DeleteAllowanceValidatorTest.java index 634298c4ac8d..67f0f46f9a84 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/DeleteAllowanceValidatorTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/DeleteAllowanceValidatorTest.java @@ -32,7 +32,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoDeleteAllowanceTransactionBody; import com.hedera.hapi.node.token.NftRemoveAllowance; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; import com.hedera.node.app.service.token.impl.validators.DeleteAllowanceValidator; import com.hedera.node.app.spi.validation.ExpiryValidator; diff --git a/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/CryptoSignatureWaivers.java b/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/CryptoSignatureWaivers.java index 7eec75f0a178..873303828010 100644 --- a/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/CryptoSignatureWaivers.java +++ b/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/CryptoSignatureWaivers.java @@ -17,7 +17,7 @@ package com.hedera.node.app.service.token; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.SigWaivers; /** Signature waivers needed for transactions in {@link TokenService}. */ diff --git a/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/api/TokenServiceApi.java b/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/api/TokenServiceApi.java index a3eb2beb5008..265fe035a229 100644 --- a/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/api/TokenServiceApi.java +++ b/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/api/TokenServiceApi.java @@ -31,7 +31,7 @@ import edu.umd.cs.findbugs.annotations.Nullable; /** - * Defines mutations that can't be expressed as a {@link com.hedera.hapi.node.transaction.TransactionBody} dispatch. + * Defines mutations that can't be expressed as a {@link com.hedera.hapi.node.base.TransactionBody} dispatch. * *

Only exported to the contract service at this time, as it is the only service that currently needs such a thing. * If, for example, we extract a {@code StakingService}, this API would likely need to expand. diff --git a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilPrngHandler.java b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilPrngHandler.java index 307b1740a6d7..44d906a3f033 100644 --- a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilPrngHandler.java +++ b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilPrngHandler.java @@ -19,7 +19,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.util.impl.records.PrngStreamBuilder; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; diff --git a/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilPrngHandlerTest.java b/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilPrngHandlerTest.java index 5bbef2c613f4..52362ede4476 100644 --- a/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilPrngHandlerTest.java +++ b/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilPrngHandlerTest.java @@ -31,7 +31,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.util.UtilPrngTransactionBody; import com.hedera.node.app.service.util.impl.handlers.UtilPrngHandler; import com.hedera.node.app.service.util.impl.records.PrngStreamBuilder; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/BlockTransactionParts.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/BlockTransactionParts.java index 8109767325f2..34db232c9977 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/BlockTransactionParts.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/BlockTransactionParts.java @@ -37,7 +37,7 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.transaction.AssessedCustomFee; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.pbj.runtime.io.buffer.Bytes; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/TransactionParts.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/TransactionParts.java index 5e3eb9daeb2a..9602c96c1956 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/TransactionParts.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/TransactionParts.java @@ -23,7 +23,7 @@ import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.pbj.runtime.ParseException; import com.hedera.pbj.runtime.io.buffer.Bytes; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/validators/block/BlockItemNonceValidator.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/validators/block/BlockItemNonceValidator.java index d1d784ae9f4a..b2d9177a3216 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/validators/block/BlockItemNonceValidator.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/validators/block/BlockItemNonceValidator.java @@ -20,7 +20,7 @@ import com.hedera.hapi.block.stream.BlockItem; import com.hedera.hapi.node.base.Transaction; import com.hedera.hapi.node.base.TransactionID; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.pbj.runtime.ParseException; import com.hedera.pbj.runtime.io.buffer.Bytes; import com.hedera.services.bdd.junit.support.BlockStreamValidator; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnFactory.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnFactory.java index a7900ead9a39..207e8a1348a0 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnFactory.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnFactory.java @@ -132,15 +132,15 @@ public TransactionID sampleRecentTxnId() { /** * Given a {@link Consumer} that mutates a {@link TransactionBody.Builder}, return a {@link Transaction.Builder} * that incorporates this consumer along with default values for some notable - * {@link com.hedera.hapi.node.transaction.TransactionBody} fields if not overridden by the consumer. + * {@link com.hedera.hapi.node.base.TransactionBody} fields if not overridden by the consumer. * *

The fields given default values are, *

    - *
  1. {@link com.hedera.hapi.node.transaction.TransactionBody#transactionID()}
    2. - *
  2. {@link com.hedera.hapi.node.transaction.TransactionBody#nodeAccountID()}
    3. - *
  3. {@link com.hedera.hapi.node.transaction.TransactionBody#transactionFee()}
    4. - *
  4. {@link com.hedera.hapi.node.transaction.TransactionBody#transactionValidDuration()}
    5. - *
  5. {@link com.hedera.hapi.node.transaction.TransactionBody#memo()}
    6. + *
  6. {@link com.hedera.hapi.node.base.TransactionBody#transactionID()}
    7. + *
  7. {@link com.hedera.hapi.node.base.TransactionBody#nodeAccountID()}
    8. + *
  8. {@link com.hedera.hapi.node.base.TransactionBody#transactionFee()}
    9. + *
  9. {@link com.hedera.hapi.node.base.TransactionBody#transactionValidDuration()}
    10. + *
  10. {@link com.hedera.hapi.node.base.TransactionBody#memo()}
    11. *
* * @param bodySpec the {@link Consumer} that mutates the {@link TransactionBody.Builder} diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/EmbeddedVerbs.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/EmbeddedVerbs.java index d561c5ba5750..d1040c3a0ed5 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/EmbeddedVerbs.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/EmbeddedVerbs.java @@ -34,7 +34,7 @@ import com.hedera.hapi.node.state.token.AccountPendingAirdrop; import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.state.token.Token; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.throttle.ThrottleAccumulator; import com.hedera.node.app.workflows.TransactionInfo; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/UtilVerbs.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/UtilVerbs.java index 046c0b67e6e0..08a85eb8942b 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/UtilVerbs.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/UtilVerbs.java @@ -2168,7 +2168,7 @@ public interface ScheduledExecutionAssertion { */ void test( @NonNull HapiSpec spec, - @NonNull com.hedera.hapi.node.transaction.TransactionBody body, + @NonNull com.hedera.hapi.node.base.TransactionBody body, @NonNull TransactionResult result); } From bbf83b20d5307c03a8606f5835b907a55b409218 Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Tue, 14 Jan 2025 13:39:54 -0800 Subject: [PATCH 08/21] Spotless Signed-off-by: Kim Rader --- hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java | 2 +- .../com/hedera/hapi/util/UnknownHederaFunctionality.java | 4 ++-- .../com/hedera/node/hapi/fixtures/TransactionHelper.java | 6 +++--- .../com/hedera/node/app/hapi/utils/CommonPbjConverters.java | 4 ++-- .../addressbook/impl/handlers/NodeCreateHandler.java | 4 ++-- .../addressbook/impl/handlers/NodeDeleteHandler.java | 4 ++-- .../addressbook/impl/handlers/NodeUpdateHandler.java | 4 ++-- .../impl/test/handlers/NodeCreateHandlerTest.java | 4 ++-- .../impl/test/handlers/NodeDeleteHandlerTest.java | 4 ++-- .../impl/test/handlers/NodeUpdateHandlerTest.java | 4 ++-- .../src/main/java/com/hedera/node/app/spi/AppContext.java | 2 +- .../com/hedera/node/app/spi/authorization/Authorizer.java | 2 +- .../main/java/com/hedera/node/app/spi/fees/FeeContext.java | 2 +- .../java/com/hedera/node/app/spi/store/StoreFactory.java | 2 +- .../java/com/hedera/node/app/spi/throttle/Throttle.java | 4 ++-- .../com/hedera/node/app/spi/workflows/DispatchOptions.java | 2 +- .../com/hedera/node/app/spi/workflows/HandleContext.java | 2 +- .../com/hedera/node/app/spi/workflows/PreHandleContext.java | 4 ++-- .../com/hedera/node/app/spi/workflows/SystemContext.java | 2 +- .../hedera/node/app/spi/workflows/TransactionHandler.java | 2 +- .../com/hedera/node/app/spi/workflows/WarmupContext.java | 2 +- .../hedera/node/app/spi/workflows/record/StreamBuilder.java | 4 ++-- .../hedera/node/app/spi/fixtures/TransactionFactory.java | 4 ++-- .../app/spi/fixtures/workflows/FakePreHandleContext.java | 4 ++-- .../src/main/java/com/hedera/node/app/Hedera.java | 2 +- .../com/hedera/node/app/authorization/AuthorizerImpl.java | 2 +- .../hedera/node/app/authorization/PrivilegesVerifier.java | 4 ++-- .../com/hedera/node/app/blocks/impl/BlockStreamBuilder.java | 4 ++-- .../hedera/node/app/blocks/impl/PairedStreamBuilder.java | 4 ++-- .../java/com/hedera/node/app/fees/ChildFeeContextImpl.java | 2 +- .../java/com/hedera/node/app/fees/FeeCalculatorImpl.java | 4 ++-- .../main/java/com/hedera/node/app/fees/FeeContextImpl.java | 2 +- .../src/main/java/com/hedera/node/app/fees/FeeManager.java | 4 ++-- .../node/app/fees/congestion/CongestionMultipliers.java | 2 +- .../congestion/UtilizationScaledThrottleMultiplier.java | 2 +- .../node/app/state/logging/TransactionStateLogger.java | 4 ++-- .../com/hedera/node/app/throttle/AppThrottleFactory.java | 4 ++-- .../node/app/throttle/NetworkUtilizationManagerImpl.java | 4 ++-- .../com/hedera/node/app/throttle/ThrottleAccumulator.java | 4 ++-- .../hedera/node/app/throttle/ThrottleServiceManager.java | 4 ++-- .../com/hedera/node/app/workflows/SolvencyPreCheck.java | 4 ++-- .../com/hedera/node/app/workflows/TransactionChecker.java | 4 ++-- .../java/com/hedera/node/app/workflows/TransactionInfo.java | 4 ++-- .../node/app/workflows/handle/DispatchHandleContext.java | 4 ++-- .../hedera/node/app/workflows/handle/cache/CacheWarmer.java | 4 ++-- .../app/workflows/handle/dispatch/ChildDispatchFactory.java | 4 ++-- .../node/app/workflows/handle/dispatch/RecordFinalizer.java | 4 ++-- .../app/workflows/handle/record/RecordStreamBuilder.java | 4 ++-- .../node/app/workflows/handle/record/SystemSetup.java | 2 +- .../workflows/handle/steps/HollowAccountCompletions.java | 4 ++-- .../app/workflows/handle/steps/PlatformStateUpdates.java | 2 +- .../node/app/workflows/handle/steps/SystemFileUpdates.java | 2 +- .../node/app/workflows/handle/steps/UserTxnFactory.java | 4 ++-- .../app/workflows/handle/throttle/DispatchUsageManager.java | 4 ++-- .../hedera/node/app/workflows/ingest/SubmissionManager.java | 2 +- .../node/app/workflows/prehandle/PreHandleContextImpl.java | 4 ++-- .../node/app/workflows/prehandle/PreHandleWorkflowImpl.java | 2 +- .../hedera/node/app/workflows/query/QueryWorkflowImpl.java | 4 ++-- .../node/app/workflows/standalone/TransactionExecutor.java | 2 +- .../standalone/impl/StandaloneDispatchFactory.java | 4 ++-- .../node/app/authorization/PrivilegesVerifierTest.java | 2 +- .../com/hedera/node/app/blocks/BlockStreamBuilderTest.java | 4 ++-- .../com/hedera/node/app/fees/ChildFeeContextImplTest.java | 4 ++-- .../com/hedera/node/app/fees/FeeCalculatorImplTest.java | 4 ++-- .../congestion/UtilizationScaledThrottleMultiplierTest.java | 4 ++-- .../hedera/node/app/throttle/AppThrottleAdviserTest.java | 4 ++-- .../hedera/node/app/throttle/AppThrottleFactoryTest.java | 4 ++-- .../hedera/node/app/throttle/ThrottleAccumulatorTest.java | 4 ++-- .../throttle/impl/NetworkUtilizationManagerImplTest.java | 4 ++-- .../com/hedera/node/app/workflows/SolvencyPreCheckTest.java | 4 ++-- .../hedera/node/app/workflows/TransactionCheckerTest.java | 4 ++-- .../node/app/workflows/TransactionScenarioBuilder.java | 4 ++-- .../app/workflows/handle/DispatchHandleContextTest.java | 4 ++-- .../node/app/workflows/handle/DispatchProcessorTest.java | 4 ++-- .../workflows/handle/dispatch/ChildDispatchFactoryTest.java | 4 ++-- .../app/workflows/handle/dispatch/RecordFinalizerTest.java | 4 ++-- .../workflows/handle/dispatch/ValidationReporterTest.java | 4 ++-- .../node/app/workflows/handle/record/RecordTestData.java | 4 ++-- .../handle/steps/HollowAccountCompletionsTest.java | 4 ++-- .../workflows/handle/steps/PlatformStateUpdatesTest.java | 2 +- .../app/workflows/handle/steps/SystemFileUpdatesTest.java | 4 ++-- .../hedera/node/app/workflows/handle/steps/UserTxnTest.java | 4 ++-- .../workflows/handle/throttle/DispatchUsageManagerTest.java | 4 ++-- .../hedera/node/app/workflows/ingest/IngestCheckerTest.java | 4 ++-- .../node/app/workflows/ingest/IngestWorkflowImplTest.java | 4 ++-- .../node/app/workflows/ingest/SubmissionManagerTest.java | 4 ++-- .../app/workflows/prehandle/PreHandleContextImplTest.java | 4 ++-- .../prehandle/PreHandleContextListUpdatesTest.java | 4 ++-- .../hedera/node/app/workflows/query/QueryCheckerTest.java | 4 ++-- .../node/app/workflows/query/QueryWorkflowImplTest.java | 4 ++-- .../app/workflows/standalone/TransactionExecutorsTest.java | 2 +- .../impl/handlers/ConsensusCreateTopicHandler.java | 4 ++-- .../impl/handlers/ConsensusDeleteTopicHandler.java | 4 ++-- .../impl/handlers/ConsensusSubmitMessageHandler.java | 4 ++-- .../impl/handlers/ConsensusUpdateTopicHandler.java | 4 ++-- .../impl/test/handlers/ConsensusCreateTopicTest.java | 4 ++-- .../impl/test/handlers/ConsensusDeleteTopicTest.java | 4 ++-- .../test/handlers/ConsensusSubmitMessageHandlerTest.java | 4 ++-- .../impl/test/handlers/ConsensusUpdateTopicHandlerTest.java | 4 ++-- .../app/service/file/impl/handlers/FileAppendHandler.java | 4 ++-- .../app/service/file/impl/handlers/FileCreateHandler.java | 4 ++-- .../app/service/file/impl/handlers/FileDeleteHandler.java | 4 ++-- .../file/impl/handlers/FileSignatureWaiversImpl.java | 2 +- .../service/file/impl/handlers/FileSystemDeleteHandler.java | 4 ++-- .../file/impl/handlers/FileSystemUndeleteHandler.java | 4 ++-- .../app/service/file/impl/handlers/FileUpdateHandler.java | 4 ++-- .../node/app/service/file/impl/schemas/V0490FileSchema.java | 2 +- .../file/impl/test/handlers/FileAppendHandlerTest.java | 4 ++-- .../app/service/file/impl/test/handlers/FileCreateTest.java | 4 ++-- .../app/service/file/impl/test/handlers/FileDeleteTest.java | 4 ++-- .../impl/test/handlers/FileSignatureWaiversImplTest.java | 2 +- .../file/impl/test/handlers/FileSystemDeleteTest.java | 4 ++-- .../file/impl/test/handlers/FileSystemUndeleteTest.java | 4 ++-- .../app/service/file/impl/test/handlers/FileUpdateTest.java | 4 ++-- .../hedera/node/app/service/file/FileSignatureWaivers.java | 2 +- .../service/networkadmin/impl/handlers/FreezeHandler.java | 4 ++-- .../impl/handlers/NetworkUncheckedSubmitHandler.java | 2 +- .../networkadmin/impl/test/handlers/FreezeHandlerTest.java | 4 ++-- .../schedule/impl/handlers/AbstractScheduleHandler.java | 4 ++-- .../app/service/schedule/impl/handlers/HandlerUtility.java | 2 +- .../schedule/impl/handlers/ScheduleCreateHandler.java | 2 +- .../schedule/impl/handlers/ScheduleDeleteHandler.java | 4 ++-- .../service/schedule/impl/handlers/ScheduleSignHandler.java | 4 ++-- .../node/app/service/schedule/impl/ScheduleTestBase.java | 4 ++-- .../service/schedule/impl/ScheduledTransactionFactory.java | 4 ++-- .../service/schedule/impl/handlers/HandlerUtilityTest.java | 4 ++-- .../schedule/impl/handlers/ScheduleCreateHandlerTest.java | 4 ++-- .../schedule/impl/handlers/ScheduleDeleteHandlerTest.java | 4 ++-- .../schedule/impl/handlers/ScheduleSignHandlerTest.java | 4 ++-- .../com/hedera/node/app/service/schedule/ExecutableTxn.java | 2 +- .../contract/impl/exec/gas/DispatchGasCalculator.java | 2 +- .../contract/impl/exec/gas/SystemContractGasCalculator.java | 2 +- .../impl/exec/scope/HandleHederaNativeOperations.java | 4 ++-- .../contract/impl/exec/scope/HandleHederaOperations.java | 4 ++-- .../impl/exec/scope/HandleSystemContractOperations.java | 4 ++-- .../impl/exec/scope/QuerySystemContractOperations.java | 4 ++-- .../contract/impl/exec/scope/SystemContractOperations.java | 4 ++-- .../impl/exec/systemcontracts/PrngSystemContract.java | 4 ++-- .../systemcontracts/has/hbarapprove/HbarApproveCall.java | 2 +- .../has/hbarapprove/HbarApproveTranslator.java | 4 ++-- .../SetUnlimitedAutoAssociationsCall.java | 2 +- .../SetUnlimitedAutoAssociationsTranslator.java | 4 ++-- .../systemcontracts/hss/DispatchForResponseCodeHssCall.java | 2 +- .../hss/schedulenative/ScheduleNativeCall.java | 4 ++-- .../hss/schedulenative/ScheduleNativeTranslator.java | 2 +- .../hss/signschedule/SignScheduleTranslator.java | 2 +- .../impl/exec/systemcontracts/hts/AddressIdConverter.java | 2 +- .../systemcontracts/hts/DispatchForResponseCodeHtsCall.java | 4 ++-- .../systemcontracts/hts/airdrops/TokenAirdropDecoder.java | 4 ++-- .../hts/airdrops/TokenAirdropTranslator.java | 2 +- .../hts/associations/AssociationsDecoder.java | 4 ++-- .../hts/associations/AssociationsTranslator.java | 2 +- .../impl/exec/systemcontracts/hts/burn/BurnDecoder.java | 4 ++-- .../impl/exec/systemcontracts/hts/burn/BurnTranslator.java | 2 +- .../hts/cancelairdrops/TokenCancelAirdropDecoder.java | 4 ++-- .../hts/cancelairdrops/TokenCancelAirdropTranslator.java | 2 +- .../hts/claimairdrops/TokenClaimAirdropDecoder.java | 4 ++-- .../hts/claimairdrops/TokenClaimAirdropTranslator.java | 2 +- .../exec/systemcontracts/hts/create/ClassicCreatesCall.java | 4 ++-- .../impl/exec/systemcontracts/hts/create/CreateDecoder.java | 4 ++-- .../systemcontracts/hts/create/CreateDecoderFunction.java | 2 +- .../exec/systemcontracts/hts/create/CreateTranslator.java | 2 +- .../exec/systemcontracts/hts/delete/DeleteTranslator.java | 4 ++-- .../systemcontracts/hts/freeze/FreezeUnfreezeDecoder.java | 4 ++-- .../hts/freeze/FreezeUnfreezeTranslator.java | 2 +- .../hts/grantapproval/AbstractGrantApprovalCall.java | 4 ++-- .../hts/grantapproval/GrantApprovalDecoder.java | 4 ++-- .../hts/grantapproval/GrantApprovalTranslator.java | 2 +- .../hts/grantrevokekyc/GrantRevokeKycDecoder.java | 4 ++-- .../hts/grantrevokekyc/GrantRevokeKycTranslator.java | 2 +- .../impl/exec/systemcontracts/hts/mint/MintDecoder.java | 4 ++-- .../impl/exec/systemcontracts/hts/mint/MintTranslator.java | 2 +- .../impl/exec/systemcontracts/hts/pauses/PausesDecoder.java | 4 ++-- .../exec/systemcontracts/hts/pauses/PausesTranslator.java | 2 +- .../hts/rejecttokens/RejectTokensDecoder.java | 4 ++-- .../hts/rejecttokens/RejectTokensTranslator.java | 2 +- .../hts/setapproval/SetApprovalForAllCall.java | 2 +- .../hts/setapproval/SetApprovalForAllDecoder.java | 4 ++-- .../hts/setapproval/SetApprovalForAllTranslator.java | 2 +- .../systemcontracts/hts/transfer/ClassicTransfersCall.java | 4 ++-- .../hts/transfer/ClassicTransfersDecoder.java | 4 ++-- .../hts/transfer/ClassicTransfersTranslator.java | 2 +- .../systemcontracts/hts/transfer/Erc20TransfersCall.java | 4 ++-- .../hts/transfer/Erc721TransferFromCall.java | 4 ++-- .../impl/exec/systemcontracts/hts/update/UpdateDecoder.java | 4 ++-- .../systemcontracts/hts/update/UpdateDecoderFunction.java | 2 +- .../systemcontracts/hts/update/UpdateExpiryTranslator.java | 2 +- .../systemcontracts/hts/update/UpdateKeysTranslator.java | 2 +- .../hts/update/UpdateNFTsMetadataTranslator.java | 2 +- .../exec/systemcontracts/hts/update/UpdateTranslator.java | 2 +- .../updatetokencustomfees/UpdateTokenCustomFeesDecoder.java | 4 ++-- .../UpdateTokenCustomFeesTranslator.java | 2 +- .../impl/exec/systemcontracts/hts/wipe/WipeDecoder.java | 4 ++-- .../impl/exec/systemcontracts/hts/wipe/WipeTranslator.java | 2 +- .../service/contract/impl/exec/utils/SchedulingUtility.java | 4 ++-- .../impl/handlers/AbstractContractTransactionHandler.java | 2 +- .../service/contract/impl/handlers/ContractCallHandler.java | 2 +- .../contract/impl/handlers/ContractCreateHandler.java | 2 +- .../contract/impl/handlers/ContractDeleteHandler.java | 4 ++-- .../contract/impl/handlers/ContractSystemDeleteHandler.java | 2 +- .../impl/handlers/ContractSystemUndeleteHandler.java | 2 +- .../contract/impl/handlers/ContractUpdateHandler.java | 4 ++-- .../contract/impl/handlers/EthereumTransactionHandler.java | 4 ++-- .../service/contract/impl/infra/HevmTransactionFactory.java | 4 ++-- .../node/app/service/contract/impl/test/TestHelpers.java | 4 ++-- .../impl/test/exec/ContextTransactionProcessorTest.java | 4 ++-- .../service/contract/impl/test/exec/QueryModuleTest.java | 2 +- .../contract/impl/test/exec/TransactionModuleTest.java | 4 ++-- .../impl/test/exec/gas/SystemContractGasCalculatorTest.java | 2 +- .../test/exec/scope/HandleHederaNativeOperationsTest.java | 4 ++-- .../impl/test/exec/scope/HandleHederaOperationsTest.java | 4 ++-- .../test/exec/scope/HandleSystemContractOperationsTest.java | 4 ++-- .../test/exec/scope/QuerySystemContractOperationsTest.java | 4 ++-- .../has/hbarApprove/HbarApproveCallTest.java | 2 +- .../SetUnlimitedAutoAssociationsCallTest.java | 2 +- .../hss/DispatchForResponseCodeHssCallTest.java | 2 +- .../hss/signschedule/SignScheduleTranslatorTest.java | 2 +- .../hts/DispatchForResponseCodeHtsCallTest.java | 4 ++-- .../test/exec/systemcontracts/hts/HtsCallAttemptTest.java | 4 ++-- .../hts/airdrops/TokenAirdropTranslatorTest.java | 2 +- .../hts/associations/AssociationsDecoderTest.java | 2 +- .../hts/associations/AssociationsTranslatorTest.java | 2 +- .../cancelairdrops/TokenCancelAirdropTranslatorTest.java | 2 +- .../hts/claimairdrops/TokenClaimAirdropTranslatorTest.java | 2 +- .../systemcontracts/hts/create/ClassicCreatesCallTest.java | 4 ++-- .../exec/systemcontracts/hts/create/CreateDecoderTest.java | 4 ++-- .../hts/freeze/FreezeUnfreezeDecoderTest.java | 2 +- .../hts/grantapproval/ERCGrantApprovalCallTest.java | 4 ++-- .../hts/grantapproval/GrantApprovalDecoderTest.java | 4 ++-- .../hts/grantrevokekyc/GrantRevokeKycDecoderTest.java | 2 +- .../exec/systemcontracts/hts/pauses/PausesDecoderTest.java | 2 +- .../hts/rejecttokens/RejectTokensTranslatorTest.java | 4 ++-- .../hts/setapproval/SetApprovalForAllCallTest.java | 2 +- .../hts/setapproval/SetApprovalForAllDecoderTest.java | 2 +- .../hts/transfer/ClassicTransfersCallTest.java | 4 ++-- .../hts/transfer/ClassicTransfersDecoderTest.java | 2 +- .../hts/transfer/ClassicTransfersGasCalcTest.java | 4 ++-- .../hts/transfer/Erc20TransfersCallTest.java | 2 +- .../hts/transfer/Erc721TransferFromCallTest.java | 4 ++-- .../systemcontracts/hts/update/UpdateTranslatorTest.java | 4 ++-- .../impl/test/handlers/ContractCallHandlerTest.java | 4 ++-- .../impl/test/handlers/ContractCreateHandlerTest.java | 4 ++-- .../impl/test/handlers/ContractDeleteHandlerTest.java | 4 ++-- .../impl/test/handlers/ContractUpdateHandlerTest.java | 4 ++-- .../impl/test/handlers/EthereumTransactionHandlerTest.java | 4 ++-- .../impl/test/infra/HevmStaticTransactionFactoryTest.java | 4 ++-- .../impl/test/infra/HevmTransactionFactoryTest.java | 4 ++-- .../app/service/token/impl/CryptoSignatureWaiversImpl.java | 2 +- .../token/impl/handlers/CryptoAddLiveHashHandler.java | 2 +- .../token/impl/handlers/CryptoApproveAllowanceHandler.java | 4 ++-- .../service/token/impl/handlers/CryptoCreateHandler.java | 4 ++-- .../token/impl/handlers/CryptoDeleteAllowanceHandler.java | 4 ++-- .../service/token/impl/handlers/CryptoDeleteHandler.java | 2 +- .../token/impl/handlers/CryptoDeleteLiveHashHandler.java | 2 +- .../service/token/impl/handlers/CryptoTransferHandler.java | 4 ++-- .../service/token/impl/handlers/CryptoUpdateHandler.java | 4 ++-- .../token/impl/handlers/TokenAccountWipeHandler.java | 4 ++-- .../service/token/impl/handlers/TokenAirdropHandler.java | 4 ++-- .../token/impl/handlers/TokenAssociateToAccountHandler.java | 4 ++-- .../app/service/token/impl/handlers/TokenBurnHandler.java | 4 ++-- .../token/impl/handlers/TokenCancelAirdropHandler.java | 2 +- .../token/impl/handlers/TokenClaimAirdropHandler.java | 4 ++-- .../app/service/token/impl/handlers/TokenCreateHandler.java | 4 ++-- .../app/service/token/impl/handlers/TokenDeleteHandler.java | 4 ++-- .../impl/handlers/TokenDissociateFromAccountHandler.java | 4 ++-- .../token/impl/handlers/TokenFeeScheduleUpdateHandler.java | 4 ++-- .../token/impl/handlers/TokenFreezeAccountHandler.java | 4 ++-- .../token/impl/handlers/TokenGrantKycToAccountHandler.java | 4 ++-- .../app/service/token/impl/handlers/TokenMintHandler.java | 4 ++-- .../app/service/token/impl/handlers/TokenPauseHandler.java | 2 +- .../app/service/token/impl/handlers/TokenRejectHandler.java | 4 ++-- .../impl/handlers/TokenRevokeKycFromAccountHandler.java | 4 ++-- .../token/impl/handlers/TokenUnfreezeAccountHandler.java | 4 ++-- .../service/token/impl/handlers/TokenUnpauseHandler.java | 2 +- .../app/service/token/impl/handlers/TokenUpdateHandler.java | 4 ++-- .../service/token/impl/handlers/TokenUpdateNftsHandler.java | 4 ++-- .../impl/handlers/staking/EndOfStakingPeriodUtils.java | 4 ++-- .../handlers/transfer/AssociateTokenRecipientsStep.java | 4 ++-- .../token/impl/handlers/transfer/AutoAccountCreator.java | 4 ++-- .../token/impl/handlers/transfer/TransferExecutor.java | 4 ++-- .../token/impl/test/CryptoSignatureWaiversImplTest.java | 4 ++-- .../impl/test/handlers/CryptoAddLiveHashHandlerTest.java | 2 +- .../test/handlers/CryptoApproveAllowanceHandlerTest.java | 4 ++-- .../token/impl/test/handlers/CryptoCreateHandlerTest.java | 4 ++-- .../test/handlers/CryptoDeleteAllowanceHandlerTest.java | 4 ++-- .../token/impl/test/handlers/CryptoDeleteHandlerTest.java | 4 ++-- .../test/handlers/CryptoTransferHandlerPureChecksTest.java | 4 ++-- .../token/impl/test/handlers/CryptoTransferHandlerTest.java | 4 ++-- .../impl/test/handlers/CryptoTransferHandlerTestBase.java | 4 ++-- .../token/impl/test/handlers/CryptoUpdateHandlerTest.java | 4 ++-- .../impl/test/handlers/TokenAccountWipeHandlerTest.java | 4 ++-- .../token/impl/test/handlers/TokenAirdropHandlerTest.java | 4 ++-- .../test/handlers/TokenAssociateToAccountHandlerTest.java | 4 ++-- .../token/impl/test/handlers/TokenBurnHandlerTest.java | 4 ++-- .../handlers/TokenCancelAirdropHandlerPureChecksTest.java | 2 +- .../impl/test/handlers/TokenCancelAirdropHandlerTest.java | 4 ++-- .../token/impl/test/handlers/TokenCreateHandlerTest.java | 4 ++-- .../token/impl/test/handlers/TokenDeleteHandlerTest.java | 4 ++-- .../handlers/TokenDissociateFromAccountHandlerTest.java | 4 ++-- .../test/handlers/TokenFeeScheduleUpdateHandlerTest.java | 4 ++-- .../impl/test/handlers/TokenFreezeAccountHandlerTest.java | 4 ++-- .../test/handlers/TokenGrantKycToAccountHandlerTest.java | 4 ++-- .../token/impl/test/handlers/TokenMintHandlerTest.java | 4 ++-- .../token/impl/test/handlers/TokenPauseHandlerTest.java | 4 ++-- .../token/impl/test/handlers/TokenRejectHandlerTest.java | 4 ++-- .../test/handlers/TokenRevokeKycFromAccountHandlerTest.java | 4 ++-- .../impl/test/handlers/TokenUnfreezeAccountHandlerTest.java | 4 ++-- .../token/impl/test/handlers/TokenUnpauseHandlerTest.java | 4 ++-- .../token/impl/test/handlers/TokenUpdateHandlerTest.java | 4 ++-- .../impl/test/handlers/TokenUpdateNftsHandlerTest.java | 4 ++-- .../handlers/staking/EndOfStakingPeriodUpdaterTest.java | 2 +- .../impl/test/handlers/staking/StakeInfoHelperTest.java | 4 ++-- .../token/impl/test/handlers/transfer/StepsBase.java | 4 ++-- .../impl/test/validators/ApproveAllowanceValidatorTest.java | 4 ++-- .../impl/test/validators/DeleteAllowanceValidatorTest.java | 4 ++-- .../node/app/service/token/CryptoSignatureWaivers.java | 2 +- .../hedera/node/app/service/token/api/TokenServiceApi.java | 2 +- .../app/service/util/impl/handlers/UtilPrngHandler.java | 2 +- .../util/impl/test/handlers/UtilPrngHandlerTest.java | 2 +- .../support/translators/inputs/BlockTransactionParts.java | 4 ++-- .../junit/support/translators/inputs/TransactionParts.java | 4 ++-- .../support/validators/block/BlockItemNonceValidator.java | 2 +- .../com/hedera/services/bdd/spec/utilops/EmbeddedVerbs.java | 2 +- 323 files changed, 544 insertions(+), 544 deletions(-) diff --git a/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java b/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java index 5321c6bd01c4..b981078f8e40 100644 --- a/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java +++ b/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java @@ -25,9 +25,9 @@ import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.SemanticVersion; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.transaction.Query; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.pbj.runtime.io.buffer.Bytes; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hapi/src/main/java/com/hedera/hapi/util/UnknownHederaFunctionality.java b/hapi/src/main/java/com/hedera/hapi/util/UnknownHederaFunctionality.java index 8b6b2f914be9..1e789ee24877 100644 --- a/hapi/src/main/java/com/hedera/hapi/util/UnknownHederaFunctionality.java +++ b/hapi/src/main/java/com/hedera/hapi/util/UnknownHederaFunctionality.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,8 +17,8 @@ package com.hedera.hapi.util; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.Query; /** * Exception raised when mapping from {@link TransactionBody} or {@link Query} to {@link HederaFunctionality} diff --git a/hapi/src/testFixtures/java/com/hedera/node/hapi/fixtures/TransactionHelper.java b/hapi/src/testFixtures/java/com/hedera/node/hapi/fixtures/TransactionHelper.java index 32dfa3c10759..fb7744b905e9 100644 --- a/hapi/src/testFixtures/java/com/hedera/node/hapi/fixtures/TransactionHelper.java +++ b/hapi/src/testFixtures/java/com/hedera/node/hapi/fixtures/TransactionHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,8 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody.Builder; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusCreateTopicTransactionBody; import com.hedera.hapi.node.consensus.ConsensusGetTopicInfoQuery; @@ -31,8 +33,6 @@ import com.hedera.hapi.node.token.CryptoGetLiveHashQuery; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; -import com.hedera.hapi.node.base.TransactionBody.Builder; import com.hedera.hapi.node.transaction.UncheckedSubmitBody; import com.hedera.pbj.runtime.Codec; import com.hedera.pbj.runtime.io.buffer.Bytes; diff --git a/hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/CommonPbjConverters.java b/hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/CommonPbjConverters.java index 5a90a456e04a..4ef4b192b410 100644 --- a/hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/CommonPbjConverters.java +++ b/hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/CommonPbjConverters.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,6 +38,7 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.scheduled.ScheduleInfo; import com.hedera.hapi.node.state.common.EntityNumber; @@ -45,7 +46,6 @@ import com.hedera.hapi.node.transaction.CustomFee; import com.hedera.hapi.node.transaction.ExchangeRate; import com.hedera.hapi.node.transaction.Query; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.pbj.runtime.Codec; import com.hedera.pbj.runtime.ParseException; diff --git a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeCreateHandler.java b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeCreateHandler.java index 12861c9ff138..64cdf658c759 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeCreateHandler.java +++ b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeCreateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,8 +33,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.state.addressbook.Node; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.addressbook.Node; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.service.addressbook.impl.records.NodeCreateStreamBuilder; import com.hedera.node.app.service.addressbook.impl.validators.AddressBookValidator; diff --git a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeDeleteHandler.java b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeDeleteHandler.java index d5dfedc7fa6b..f20169a7cb67 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeDeleteHandler.java +++ b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,8 +27,8 @@ import com.hedera.hapi.node.addressbook.NodeDeleteTransactionBody; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.state.addressbook.Node; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.addressbook.Node; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.spi.fees.FeeContext; diff --git a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeUpdateHandler.java b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeUpdateHandler.java index 265edac6982e..8be3c43e979e 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeUpdateHandler.java +++ b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeUpdateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,8 +32,8 @@ import com.hedera.hapi.node.addressbook.NodeUpdateTransactionBody; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.state.addressbook.Node; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.addressbook.Node; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.service.addressbook.impl.validators.AddressBookValidator; diff --git a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeCreateHandlerTest.java b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeCreateHandlerTest.java index def90845132f..8b37da1b3fb0 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeCreateHandlerTest.java +++ b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeCreateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,8 +43,8 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ServiceEndpoint; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionID; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.service.addressbook.impl.handlers.NodeCreateHandler; import com.hedera.node.app.service.addressbook.impl.records.NodeCreateStreamBuilder; diff --git a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeDeleteHandlerTest.java b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeDeleteHandlerTest.java index 3a1a05b16807..44235539c72f 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeDeleteHandlerTest.java +++ b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeDeleteHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.addressbook.Node; import com.hedera.hapi.node.state.common.EntityNumber; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.ReadableNodeStoreImpl; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; diff --git a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeUpdateHandlerTest.java b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeUpdateHandlerTest.java index d0a86326a1e0..c5fbdad4224e 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeUpdateHandlerTest.java +++ b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeUpdateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,8 +41,8 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ServiceEndpoint; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionID; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.service.addressbook.impl.handlers.NodeUpdateHandler; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java index 3670489da305..ac45b56093a6 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/authorization/Authorizer.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/authorization/Authorizer.java index eb719150c081..c919e5aba6c8 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/authorization/Authorizer.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/authorization/Authorizer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/FeeContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/FeeContext.java index 27097cfc442f..f75f7c6007a5 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/FeeContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/FeeContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/store/StoreFactory.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/store/StoreFactory.java index 05b32d66e0c1..04c2275b8b96 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/store/StoreFactory.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/store/StoreFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/throttle/Throttle.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/throttle/Throttle.java index 05379602e792..57223e5669a0 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/throttle/Throttle.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/throttle/Throttle.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; import com.hedera.node.app.spi.AppContext; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/DispatchOptions.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/DispatchOptions.java index 62a341dad7d7..052b6f9b94a3 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/DispatchOptions.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/DispatchOptions.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java index 01c6f2d3ed3b..fdc0a43fb937 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/PreHandleContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/PreHandleContext.java index 121b95df3168..28fe4175e5d3 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/PreHandleContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/PreHandleContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ import com.hedera.hapi.node.base.ContractID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.pbj.runtime.io.buffer.Bytes; import com.swirlds.config.api.Configuration; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java index 4aae37f6049d..37d058cffc2a 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/TransactionHandler.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/TransactionHandler.java index c12dffceda26..1b1e0a5afe67 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/TransactionHandler.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/TransactionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2024 Hedera Hashgraph, LLC + * Copyright (C) 2020-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/WarmupContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/WarmupContext.java index 068b63c787d3..980390ad1794 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/WarmupContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/WarmupContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/record/StreamBuilder.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/record/StreamBuilder.java index 6c4e6fe80bf0..6aed24944385 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/record/StreamBuilder.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/record/StreamBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,10 +30,10 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.HandleContext; import com.hedera.pbj.runtime.io.buffer.Bytes; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TransactionFactory.java b/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TransactionFactory.java index 22541802e772..f737080210fd 100644 --- a/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TransactionFactory.java +++ b/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TransactionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,10 +20,10 @@ import com.hedera.hapi.node.base.ContractID; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.pbj.runtime.Codec; import com.hedera.pbj.runtime.io.buffer.Bytes; import com.hedera.pbj.runtime.io.stream.WritableStreamingData; diff --git a/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/workflows/FakePreHandleContext.java b/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/workflows/FakePreHandleContext.java index 3b060529df07..31a52a6873a8 100644 --- a/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/workflows/FakePreHandleContext.java +++ b/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/workflows/FakePreHandleContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,9 +28,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.Key.KeyOneOfType; import com.hedera.hapi.node.base.ResponseCodeEnum; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.PreHandleContext; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java index 6126dfa6cfca..3e1229936032 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java @@ -53,10 +53,10 @@ import com.hedera.hapi.block.stream.output.StateChanges; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SemanticVersion; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.blockrecords.BlockInfo; import com.hedera.hapi.node.state.blockstream.BlockStreamInfo; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.platform.event.StateSignatureTransaction; import com.hedera.hapi.platform.state.PlatformState; import com.hedera.hapi.util.HapiUtils; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/AuthorizerImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/AuthorizerImpl.java index ebe44f8809df..1f05921213d7 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/AuthorizerImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/AuthorizerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/PrivilegesVerifier.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/PrivilegesVerifier.java index e331fe8708bb..09136554706c 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/PrivilegesVerifier.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/PrivilegesVerifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,10 +24,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.file.SystemDeleteTransactionBody; import com.hedera.hapi.node.file.SystemUndeleteTransactionBody; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.authorization.SystemPrivilege; import com.hedera.node.config.ConfigProvider; import com.hedera.node.config.data.AccountsConfig; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamBuilder.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamBuilder.java index 3c31cc31370e..4731f6df93ac 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamBuilder.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,6 +53,7 @@ import com.hedera.hapi.node.base.TokenType; import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; @@ -60,7 +61,6 @@ import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.PendingAirdropRecord; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.TransactionReceipt; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.platform.event.EventTransaction; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/PairedStreamBuilder.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/PairedStreamBuilder.java index 522a18798af9..0ff225e2cb5a 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/PairedStreamBuilder.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/PairedStreamBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,13 +30,13 @@ import com.hedera.hapi.node.base.TokenType; import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.AssessedCustomFee; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.PendingAirdropRecord; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.streams.ContractActions; import com.hedera.hapi.streams.ContractBytecode; import com.hedera.hapi.streams.ContractStateChanges; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/ChildFeeContextImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/ChildFeeContextImpl.java index c849d446b961..ddb02f4e091c 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/ChildFeeContextImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/ChildFeeContextImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeCalculatorImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeCalculatorImpl.java index 2c383c331ea2..89818e65f6de 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeCalculatorImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeCalculatorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,11 +30,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.ExchangeRate; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.hapi.fees.calc.OverflowCheckingCalc; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeContextImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeContextImpl.java index 9ef8aca6db8c..1ba7900554ad 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeContextImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeContextImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeManager.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeManager.java index 451ff07151b0..189abc1a88cc 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeManager.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,8 +33,8 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionFeeSchedule; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionFeeSchedule; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.spi.fees.FeeCalculator; import com.hedera.node.app.store.ReadableStoreFactory; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/CongestionMultipliers.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/CongestionMultipliers.java index a423f39355e4..3dad83e3469f 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/CongestionMultipliers.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/CongestionMultipliers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplier.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplier.java index fa0ae5b7f3a4..e1b754a6105b 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplier.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/logging/TransactionStateLogger.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/logging/TransactionStateLogger.java index 29070f5fd3f6..eb8f216e5b15 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/logging/TransactionStateLogger.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/logging/TransactionStateLogger.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TopicID; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.node.app.workflows.prehandle.PreHandleResult; import com.swirlds.platform.system.Round; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/AppThrottleFactory.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/AppThrottleFactory.java index a96208531c40..6b00656ea630 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/AppThrottleFactory.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/AppThrottleFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,10 +22,10 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; import com.hedera.node.app.spi.throttle.Throttle; import com.hedera.node.app.workflows.TransactionInfo; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/NetworkUtilizationManagerImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/NetworkUtilizationManagerImpl.java index 8d58e4a72436..87397d4e469b 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/NetworkUtilizationManagerImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/NetworkUtilizationManagerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionID; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.throttle.annotations.BackendThrottle; import com.hedera.node.app.workflows.TransactionInfo; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleAccumulator.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleAccumulator.java index b36cba77110d..0e574e5cae11 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleAccumulator.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleAccumulator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,6 +43,7 @@ import com.hedera.hapi.node.base.NftTransfer; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractCallLocalQuery; @@ -51,7 +52,6 @@ import com.hedera.hapi.node.token.TokenMintTransactionBody; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.hapi.utils.sysfiles.domain.throttling.ThrottleBucket; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleServiceManager.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleServiceManager.java index c1731c2d140d..266f8a24731f 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleServiceManager.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleServiceManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,11 +25,11 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.congestion.CongestionLevelStarts; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshot; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/SolvencyPreCheck.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/SolvencyPreCheck.java index ca09b70f056a..bb0f32548fd2 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/SolvencyPreCheck.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/SolvencyPreCheck.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,8 +33,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.util.HapiUtils; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java index 63eb563d73a2..69ee47d9682f 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,9 +39,9 @@ import com.hedera.hapi.node.base.SignaturePair; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.annotations.MaxSignedTxnSize; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java index a55b6e776285..646cffa8d670 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.pbj.runtime.io.buffer.Bytes; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/DispatchHandleContext.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/DispatchHandleContext.java index f1a1ef11012d..069148e00bb4 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/DispatchHandleContext.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/DispatchHandleContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,8 +29,8 @@ import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ChildFeeContextImpl; import com.hedera.node.app.fees.ExchangeRateManager; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/cache/CacheWarmer.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/cache/CacheWarmer.java index bd7e86039044..9fa3f671f073 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/cache/CacheWarmer.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/cache/CacheWarmer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionID; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.TransactionHandler; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactory.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactory.java index 0174c7c6584c..07193999de59 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactory.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,10 +37,10 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeAccumulator; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizer.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizer.java index 65415e3b1cbb..53e67a94ed39 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizer.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,8 @@ import com.hedera.hapi.node.base.AccountAmount; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransferList; import com.hedera.node.app.service.token.impl.handlers.FinalizeRecordHandler; import com.hedera.node.app.spi.workflows.record.StreamBuilder; import com.hedera.node.app.workflows.handle.Dispatch; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/RecordStreamBuilder.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/RecordStreamBuilder.java index 0f76d67292cd..ac5bda8aacab 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/RecordStreamBuilder.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/RecordStreamBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,6 +37,7 @@ import com.hedera.hapi.node.base.TokenType; import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; @@ -44,7 +45,6 @@ import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.PendingAirdropRecord; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.TransactionReceipt; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.streams.ContractActions; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/SystemSetup.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/SystemSetup.java index 58589659ed84..90d07bbe62a8 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/SystemSetup.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/SystemSetup.java @@ -37,13 +37,13 @@ import com.hedera.hapi.node.base.Duration; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.transaction.ExchangeRateSet; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.ids.EntityIdService; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.schemas.V053AddressBookSchema; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletions.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletions.java index 9c2020e8b3d8..df1874c143fc 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletions.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletions.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,9 +24,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.handlers.EthereumTransactionHandler; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdates.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdates.java index 767584d66292..7d1f3cb1ce29 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdates.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdates.java @@ -21,10 +21,10 @@ import static java.util.Spliterator.DISTINCT; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.roster.Roster; import com.hedera.hapi.node.state.roster.RosterEntry; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.roster.RosterService; import com.hedera.node.app.service.addressbook.AddressBookService; import com.hedera.node.app.service.addressbook.impl.ReadableNodeStoreImpl; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdates.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdates.java index 31a2917d5089..1f802f25c826 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdates.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdates.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/UserTxnFactory.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/UserTxnFactory.java index f40218f7ed24..60af363401a5 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/UserTxnFactory.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/UserTxnFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,8 +32,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.node.app.blocks.BlockStreamManager; import com.hedera.node.app.blocks.impl.BoundaryStateChangeListener; import com.hedera.node.app.blocks.impl.KVStateChangeListener; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManager.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManager.java index 4406bd7fafd6..98c25c79e65a 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManager.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,10 +30,10 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.HederaFunctionality; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; import com.hedera.node.app.throttle.CongestionThrottleService; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/ingest/SubmissionManager.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/ingest/SubmissionManager.java index 942200278fc9..cb28478324e5 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/ingest/SubmissionManager.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/ingest/SubmissionManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImpl.java index 1d9a4dbe5168..f064716dc5b2 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,9 +30,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.Key.KeyOneOfType; import com.hedera.hapi.node.base.ResponseCodeEnum; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.PreHandleContext; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleWorkflowImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleWorkflowImpl.java index 9fa0a989221d..849c518a9733 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleWorkflowImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleWorkflowImpl.java @@ -31,8 +31,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignaturePair; -import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.platform.event.StateSignatureTransaction; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.signature.ExpandedSignaturePair; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/query/QueryWorkflowImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/query/QueryWorkflowImpl.java index 55308099f62a..16a83e83e1e6 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/query/QueryWorkflowImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/query/QueryWorkflowImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,9 +34,9 @@ import com.hedera.hapi.node.base.ResponseHeader; import com.hedera.hapi.node.base.ResponseType; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.Response; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ExchangeRateManager; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutor.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutor.java index 2962cbd8b30f..af2520a5142f 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutor.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneDispatchFactory.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneDispatchFactory.java index e494e7a78f17..cb0453b5572e 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneDispatchFactory.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneDispatchFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,8 +27,8 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.transaction.SignedTransaction; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.SignedTransaction; import com.hedera.hapi.platform.event.EventTransaction; import com.hedera.node.app.blocks.impl.BoundaryStateChangeListener; import com.hedera.node.app.blocks.impl.KVStateChangeListener; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/authorization/PrivilegesVerifierTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/authorization/PrivilegesVerifierTest.java index d5165d922906..ba56700764e4 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/authorization/PrivilegesVerifierTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/authorization/PrivilegesVerifierTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java index bede32e5c82c..6e3c6a06ba23 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,13 +33,13 @@ import com.hedera.hapi.node.base.TokenAssociation; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.AssessedCustomFee; import com.hedera.hapi.node.transaction.ExchangeRateSet; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.streams.ContractStateChanges; import com.hedera.node.app.blocks.impl.BlockStreamBuilder; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/ChildFeeContextImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/ChildFeeContextImplTest.java index 1b3bdaaabe42..dd0ffebed836 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/ChildFeeContextImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/ChildFeeContextImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,8 +29,8 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.authorization.Authorizer; import com.hedera.node.app.spi.fees.FeeCalculator; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/FeeCalculatorImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/FeeCalculatorImplTest.java index 0ac7be7e329f..ff198a3aca9b 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/FeeCalculatorImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/FeeCalculatorImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,8 +24,8 @@ import static org.mockito.Mockito.verify; import com.hedera.hapi.node.base.*; -import com.hedera.hapi.node.transaction.ExchangeRate; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.ExchangeRate; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.fixtures.state.FakeState; import com.hedera.node.app.store.ReadableStoreFactory; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplierTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplierTest.java index 17351071de78..0a88f9af28f8 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplierTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplierTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,6 +38,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.common.EntityIDPair; import com.hedera.hapi.node.state.common.EntityNumber; @@ -49,7 +50,6 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenMintTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fixtures.state.FakeState; import com.hedera.node.app.service.consensus.ConsensusService; import com.hedera.node.app.service.consensus.impl.ConsensusServiceImpl; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleAdviserTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleAdviserTest.java index b16fc310f1cc..c7d179fb771c 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleAdviserTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleAdviserTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,10 +23,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.workflows.TransactionInfo; import com.hedera.node.app.workflows.handle.record.RecordStreamBuilder; import com.hedera.node.app.workflows.handle.stack.SavepointStackImpl; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleFactoryTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleFactoryTest.java index 37ba6ea706fd..448fdb9d5603 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleFactoryTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,12 +29,12 @@ import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshot; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; import com.hedera.node.app.hapi.utils.throttles.GasLimitDeterministicThrottle; import com.hedera.node.app.workflows.TransactionInfo; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java index ce4ca788dfd6..cafaa5033ec5 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,6 +51,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractCallTransactionBody; @@ -66,7 +67,6 @@ import com.hedera.hapi.node.token.TokenMintTransactionBody; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.sysfiles.domain.throttling.ScaleFactor; import com.hedera.node.app.hapi.utils.throttles.BucketThrottle; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/impl/NetworkUtilizationManagerImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/impl/NetworkUtilizationManagerImplTest.java index 2a1f49acd92f..3d2c18f603d2 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/impl/NetworkUtilizationManagerImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/impl/NetworkUtilizationManagerImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionID; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; import com.hedera.node.app.hapi.utils.throttles.GasLimitDeterministicThrottle; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/SolvencyPreCheckTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/SolvencyPreCheckTest.java index a5d123c33c31..447d13473fb9 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/SolvencyPreCheckTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/SolvencyPreCheckTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,13 +37,13 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.EthereumTransactionBody; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java index ad6cd70b3ded..54d2ec3a1b9f 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,10 +46,10 @@ import com.hedera.hapi.node.base.SignaturePair; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusCreateTopicTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fixtures.AppTestBase; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java index 77b10b2e39be..e0e1eb73f22e 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,11 +25,11 @@ import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.fixtures.Scenarios; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java index f7e5db86603e..0e1bb82cbf39 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,12 +63,12 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusSubmitMessageTransactionBody; import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ChildFeeContextImpl; import com.hedera.node.app.fees.ExchangeRateManager; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchProcessorTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchProcessorTest.java index eb4456e7b16f..55fc7ed3d972 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchProcessorTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchProcessorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,10 +55,10 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.transaction.ExchangeRateSet; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeAccumulator; import com.hedera.node.app.service.contract.impl.handlers.EthereumTransactionHandler; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactoryTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactoryTest.java index bab505597646..d6c1b021b61a 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactoryTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,9 +33,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.ThresholdKey; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java index 7f2a3faafe46..3f0339dbbb02 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,9 +38,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.FinalizeRecordHandler; import com.hedera.node.app.service.token.records.FinalizeContext; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ValidationReporterTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ValidationReporterTest.java index c745de732020..83e039f6a377 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ValidationReporterTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ValidationReporterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,9 +48,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.signature.AppKeyVerifier; import com.hedera.node.app.signature.impl.SignatureVerificationImpl; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/record/RecordTestData.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/record/RecordTestData.java index 434e4deb38c9..0b11838876c3 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/record/RecordTestData.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/record/RecordTestData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TokenType; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.transaction.SignedTransaction; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.SignedTransaction; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.streams.HashAlgorithm; import com.hedera.hapi.streams.HashObject; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java index ddf4c644e482..b397f831477c 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,12 +34,12 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.EthereumTransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxSigs; import com.hedera.node.app.service.contract.impl.handlers.EthereumTransactionHandler; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java index e9dee34dcdd8..768be96298c3 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java @@ -38,6 +38,7 @@ import com.hedera.hapi.node.base.ServiceEndpoint; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.freeze.FreezeTransactionBody; import com.hedera.hapi.node.state.addressbook.Node; import com.hedera.hapi.node.state.common.EntityNumber; @@ -47,7 +48,6 @@ import com.hedera.hapi.node.state.roster.RoundRosterPair; import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.platform.state.PlatformState; import com.hedera.node.app.fixtures.state.FakeState; import com.hedera.node.app.roster.RosterService; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java index 560c3d974e7b..7d41cc548d44 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,12 +26,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.FileID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.FileAppendTransactionBody; import com.hedera.hapi.node.file.FileUpdateTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.config.ConfigProviderImpl; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/UserTxnTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/UserTxnTest.java index 89c98377c609..5e10ced2cf29 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/UserTxnTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/UserTxnTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.transaction.ExchangeRateSet; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.platform.event.EventTransaction; import com.hedera.node.app.blocks.BlockStreamManager; import com.hedera.node.app.blocks.impl.BlockStreamBuilder; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManagerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManagerTest.java index b2db3cfdc8e9..555100742cd9 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManagerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,11 +41,11 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestCheckerTest.java index f301c2c176b9..4fdaba822635 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestCheckerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,10 +54,10 @@ import com.hedera.hapi.node.base.ThresholdKey; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.UncheckedSubmitBody; import com.hedera.node.app.fees.FeeManager; import com.hedera.node.app.fixtures.AppTestBase; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java index 213f8e034222..60e32c980460 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,8 +40,8 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.TransactionResponse; import com.hedera.node.app.fixtures.AppTestBase; import com.hedera.node.app.spi.workflows.PreCheckException; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/SubmissionManagerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/SubmissionManagerTest.java index 45e0d76f5365..9e7c0f354d19 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/SubmissionManagerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/SubmissionManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,8 +24,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.UncheckedSubmitBody; import com.hedera.node.app.fixtures.AppTestBase; import com.hedera.node.app.spi.workflows.PreCheckException; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImplTest.java index da86a0f3adbf..c3e6974aa92b 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.ThresholdKey; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.fixtures.Scenarios; import com.hedera.node.app.spi.workflows.PreCheckException; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextListUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextListUpdatesTest.java index 1c2ad4383c8d..61fd7983483e 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextListUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextListUpdatesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.ThresholdKey; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.PreHandleContext; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryCheckerTest.java index 1e16cffa3770..9d5f9e525ea9 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryCheckerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,12 +41,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.FeeManager; import com.hedera.node.app.fixtures.AppTestBase; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryWorkflowImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryWorkflowImplTest.java index eb574fdd0b8f..334a08b76356 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryWorkflowImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryWorkflowImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,6 +50,7 @@ import com.hedera.hapi.node.base.ResponseType; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.FileGetInfoQuery; import com.hedera.hapi.node.file.FileGetInfoResponse; @@ -57,7 +58,6 @@ import com.hedera.hapi.node.network.NetworkGetExecutionTimeResponse; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.Response; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; import com.hedera.node.app.fixtures.AppTestBase; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/standalone/TransactionExecutorsTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/standalone/TransactionExecutorsTest.java index c47ef61e0669..1083ce2457e5 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/standalone/TransactionExecutorsTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/standalone/TransactionExecutorsTest.java @@ -36,6 +36,7 @@ import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.ServiceEndpoint; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; @@ -43,7 +44,6 @@ import com.hedera.hapi.node.state.blockrecords.BlockInfo; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.config.BootstrapConfigProviderImpl; import com.hedera.node.app.config.ConfigProviderImpl; import com.hedera.node.app.fees.FeeService; diff --git a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusCreateTopicHandler.java b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusCreateTopicHandler.java index e4f001a3d9df..c5e46942be56 100644 --- a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusCreateTopicHandler.java +++ b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusCreateTopicHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,8 +32,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TopicID; -import com.hedera.hapi.node.state.consensus.Topic; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.consensus.Topic; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusDeleteTopicHandler.java b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusDeleteTopicHandler.java index 9fdfc91d2bca..ac8cd03736ed 100644 --- a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusDeleteTopicHandler.java +++ b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusDeleteTopicHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,9 +25,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TopicID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.consensus.ConsensusDeleteTopicTransactionBody; import com.hedera.hapi.node.state.consensus.Topic; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.ConsensusServiceFeeBuilder; import com.hedera.node.app.hapi.utils.fee.SigValueObj; diff --git a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusSubmitMessageHandler.java b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusSubmitMessageHandler.java index 40298bc89e27..bf72bf9fb558 100644 --- a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusSubmitMessageHandler.java +++ b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusSubmitMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TopicID; +import com.hedera.hapi.node.base.TransactionBody; 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.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusUpdateTopicHandler.java b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusUpdateTopicHandler.java index 803aa0d427de..1170a4af54bc 100644 --- a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusUpdateTopicHandler.java +++ b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusUpdateTopicHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,9 +39,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TopicID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.consensus.ConsensusUpdateTopicTransactionBody; import com.hedera.hapi.node.state.consensus.Topic; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.service.consensus.ReadableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusCreateTopicTest.java b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusCreateTopicTest.java index 2a6b7f7d00f7..939f4fcd755e 100644 --- a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusCreateTopicTest.java +++ b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusCreateTopicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,11 +38,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TopicID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusCreateTopicTransactionBody; import com.hedera.hapi.node.state.consensus.Topic; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; import com.hedera.node.app.service.consensus.impl.handlers.ConsensusCreateTopicHandler; import com.hedera.node.app.service.consensus.impl.records.ConsensusCreateTopicStreamBuilder; diff --git a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusDeleteTopicTest.java b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusDeleteTopicTest.java index 18737c49c75d..fd3492510885 100644 --- a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusDeleteTopicTest.java +++ b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusDeleteTopicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TopicID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusDeleteTopicTransactionBody; import com.hedera.hapi.node.state.consensus.Topic; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.consensus.impl.ReadableTopicStoreImpl; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusSubmitMessageHandlerTest.java b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusSubmitMessageHandlerTest.java index 12895206800e..756ef41bd13f 100644 --- a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusSubmitMessageHandlerTest.java +++ b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusSubmitMessageHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,11 +40,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TopicID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; 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.base.TransactionBody; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.consensus.impl.ReadableTopicStoreImpl; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusUpdateTopicHandlerTest.java b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusUpdateTopicHandlerTest.java index c621a73f008a..970b0b2a12e1 100644 --- a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusUpdateTopicHandlerTest.java +++ b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusUpdateTopicHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,10 +42,10 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TopicID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusUpdateTopicTransactionBody; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.consensus.impl.handlers.ConsensusUpdateTopicHandler; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileAppendHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileAppendHandler.java index 3e56416fc896..8b80c12330f3 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileAppendHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileAppendHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,9 +29,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.file.FileAppendTransactionBody; import com.hedera.hapi.node.state.file.File; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.file.FileSignatureWaivers; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileCreateHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileCreateHandler.java index bf71d59fca96..6aa65da348a9 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileCreateHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileCreateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,9 +28,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.SubType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.file.FileCreateTransactionBody; import com.hedera.hapi.node.state.file.File; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.file.FileOpsUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileDeleteHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileDeleteHandler.java index 8cc8c61f109d..6d55ce94a0c3 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileDeleteHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.file.FileDeleteTransactionBody; import com.hedera.hapi.node.state.file.File; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSignatureWaiversImpl.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSignatureWaiversImpl.java index 8f44e72e4dc8..0e14778bf8b5 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSignatureWaiversImpl.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSignatureWaiversImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2024 Hedera Hashgraph, LLC + * Copyright (C) 2020-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemDeleteHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemDeleteHandler.java index 3e199e73c214..7a71c2b1a289 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemDeleteHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,8 +24,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TimestampSeconds; -import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.file.File; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemUndeleteHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemUndeleteHandler.java index 1fc49168505c..e028a038354f 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemUndeleteHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemUndeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.file.File; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileUpdateHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileUpdateHandler.java index 97234b893be7..b6efe2db1f6a 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileUpdateHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileUpdateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.file.FileUpdateTransactionBody; import com.hedera.hapi.node.state.file.File; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.file.ExtantFileContext; import com.hedera.node.app.hapi.fees.usage.file.FileOpsUsage; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/V0490FileSchema.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/V0490FileSchema.java index e479b9ececb5..35a5a45b4a5f 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/V0490FileSchema.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/V0490FileSchema.java @@ -39,6 +39,7 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TimestampSeconds; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionFeeSchedule; import com.hedera.hapi.node.file.FileCreateTransactionBody; import com.hedera.hapi.node.file.FileUpdateTransactionBody; @@ -49,7 +50,6 @@ import com.hedera.hapi.node.transaction.ExchangeRate; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.ThrottleDefinitions; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.spi.workflows.SystemContext; import com.hedera.node.config.ConfigProvider; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileAppendHandlerTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileAppendHandlerTest.java index 5278aed04ab2..00765f88e414 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileAppendHandlerTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileAppendHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,12 +35,12 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.FileAppendTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.primitives.ProtoBytes; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.WritableFileStore; import com.hedera.node.app.service.file.impl.WritableUpgradeFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileCreateTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileCreateTest.java index 85a8e80e651f..17c276110a65 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileCreateTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileCreateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,11 +40,11 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ShardID; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.FileCreateTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.file.FileOpsUsage; import com.hedera.node.app.service.file.impl.WritableFileStore; import com.hedera.node.app.service.file.impl.handlers.FileCreateHandler; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileDeleteTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileDeleteTest.java index 8a470c464d4d..4df3b1d35fa4 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileDeleteTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileDeleteTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,11 +35,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.FileDeleteTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.ReadableFileStoreImpl; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSignatureWaiversImplTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSignatureWaiversImplTest.java index 07876977d2a3..355eb3d0f6cf 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSignatureWaiversImplTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSignatureWaiversImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemDeleteTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemDeleteTest.java index a5be4092992e..3db32d5976bd 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemDeleteTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemDeleteTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.SystemDeleteTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.ReadableFileStoreImpl; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemUndeleteTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemUndeleteTest.java index 0e6ffd4dbbc2..2983ad7ba5a6 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemUndeleteTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemUndeleteTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.SystemUndeleteTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.ReadableFileStoreImpl; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileUpdateTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileUpdateTest.java index ba77e80c630e..0bfe2530f69e 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileUpdateTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileUpdateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,11 +35,11 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.FileUpdateTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.file.FileOpsUsage; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.WritableFileStore; diff --git a/hedera-node/hedera-file-service/src/main/java/com/hedera/node/app/service/file/FileSignatureWaivers.java b/hedera-node/hedera-file-service/src/main/java/com/hedera/node/app/service/file/FileSignatureWaivers.java index 87900608d327..124894f5fed9 100644 --- a/hedera-node/hedera-file-service/src/main/java/com/hedera/node/app/service/file/FileSignatureWaivers.java +++ b/hedera-node/hedera-file-service/src/main/java/com/hedera/node/app/service/file/FileSignatureWaivers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2024 Hedera Hashgraph, LLC + * Copyright (C) 2021-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/FreezeHandler.java b/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/FreezeHandler.java index d94bb862b87f..6388930f882e 100644 --- a/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/FreezeHandler.java +++ b/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/FreezeHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,9 +27,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.freeze.FreezeTransactionBody; import com.hedera.hapi.node.freeze.FreezeType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.file.ReadableUpgradeFileStore; import com.hedera.node.app.service.networkadmin.ReadableFreezeStore; diff --git a/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/NetworkUncheckedSubmitHandler.java b/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/NetworkUncheckedSubmitHandler.java index f56aa6ead690..e454677f43f2 100644 --- a/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/NetworkUncheckedSubmitHandler.java +++ b/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/NetworkUncheckedSubmitHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-network-admin-service-impl/src/test/java/com/hedera/node/app/service/networkadmin/impl/test/handlers/FreezeHandlerTest.java b/hedera-node/hedera-network-admin-service-impl/src/test/java/com/hedera/node/app/service/networkadmin/impl/test/handlers/FreezeHandlerTest.java index 2c8754bf59dd..8816f4047baf 100644 --- a/hedera-node/hedera-network-admin-service-impl/src/test/java/com/hedera/node/app/service/networkadmin/impl/test/handlers/FreezeHandlerTest.java +++ b/hedera-node/hedera-network-admin-service-impl/src/test/java/com/hedera/node/app/service/networkadmin/impl/test/handlers/FreezeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,13 +39,13 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.freeze.FreezeTransactionBody; import com.hedera.hapi.node.freeze.FreezeType; import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.file.ReadableUpgradeFileStore; import com.hedera.node.app.service.networkadmin.impl.WritableFreezeStore; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java index 41d6e64c4527..4adec5cfc9e8 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,8 +37,8 @@ import com.hedera.hapi.node.base.Key.KeyOneOfType; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ScheduleID; -import com.hedera.hapi.node.state.schedule.Schedule; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.schedule.Schedule; import com.hedera.node.app.service.schedule.ReadableScheduleStore; import com.hedera.node.app.service.schedule.ScheduleStreamBuilder; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java index e8cc50c0ca7b..db14cd41694f 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java @@ -22,10 +22,10 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody.DataOneOfType; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.HandleException; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java index 7e492d3dca32..8260edd2d705 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java @@ -44,12 +44,12 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ScheduleID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.scheduled.ScheduleCreateTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; import com.hedera.hapi.node.state.schedule.ScheduledOrder; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.schedule.ScheduleOpsUsage; import com.hedera.node.app.hapi.utils.fee.SigValueObj; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandler.java index b1d4eac177ea..1115fc1920bd 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandler.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,9 +31,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.SubType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.ScheduleDeleteTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.schedule.ScheduleOpsUsage; import com.hedera.node.app.hapi.utils.fee.SigValueObj; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandler.java index 77b9718ded76..13bde4bba797 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandler.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,9 +28,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.SubType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.ScheduleSignTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.schedule.ScheduleOpsUsage; import com.hedera.node.app.hapi.utils.fee.SigValueObj; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduleTestBase.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduleTestBase.java index 15b36406b588..0d5205767451 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduleTestBase.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduleTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,7 @@ import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TimestampSeconds; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusCreateTopicTransactionBody; import com.hedera.hapi.node.consensus.ConsensusDeleteTopicTransactionBody; @@ -78,7 +79,6 @@ import com.hedera.hapi.node.token.TokenUnpauseTransactionBody; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; import com.hedera.hapi.node.token.TokenWipeAccountTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.util.UtilPrngTransactionBody; import com.hedera.node.app.service.schedule.ReadableScheduleStore; import com.hedera.node.app.service.schedule.WritableScheduleStore; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduledTransactionFactory.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduledTransactionFactory.java index 389f37a99e82..14a0d0d3595f 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduledTransactionFactory.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduledTransactionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,12 +20,12 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.scheduled.ScheduleCreateTransactionBody; import com.hedera.hapi.node.scheduled.ScheduleCreateTransactionBody.Builder; import com.hedera.hapi.node.token.TokenBurnTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import edu.umd.cs.findbugs.annotations.NonNull; public final class ScheduledTransactionFactory { diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtilityTest.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtilityTest.java index 5539af7efc80..3f100887a784 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtilityTest.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtilityTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,10 +20,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody.DataOneOfType; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.PreCheckException; import edu.umd.cs.findbugs.annotations.Nullable; import java.security.InvalidKeyException; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandlerTest.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandlerTest.java index 756c6680cfb3..836261ad134f 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandlerTest.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,12 +31,12 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody.DataOneOfType; import com.hedera.hapi.node.state.schedule.Schedule; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.schedule.WritableScheduleStore; import com.hedera.node.app.service.schedule.impl.ScheduledTransactionFactory; import com.hedera.node.app.signature.impl.SignatureVerificationImpl; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandlerTest.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandlerTest.java index f932d6119e97..9440e7eb5eb7 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandlerTest.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,10 +24,10 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ScheduleID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.ScheduleDeleteTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.signature.impl.SignatureVerificationImpl; import com.hedera.node.app.spi.fixtures.Assertions; import com.hedera.node.app.spi.signatures.VerificationAssistant; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandlerTest.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandlerTest.java index 537a14a85457..0e672e5fc35d 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandlerTest.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,10 +22,10 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ScheduleID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.ScheduleSignTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.fixtures.Assertions; import com.hedera.node.app.spi.key.KeyComparator; import com.hedera.node.app.spi.signatures.VerificationAssistant; diff --git a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ExecutableTxn.java b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ExecutableTxn.java index 159e32a53d7b..69f51316f278 100644 --- a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ExecutableTxn.java +++ b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ExecutableTxn.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/DispatchGasCalculator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/DispatchGasCalculator.java index 0a2fc9f515f7..c2ced66678a5 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/DispatchGasCalculator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/DispatchGasCalculator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/SystemContractGasCalculator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/SystemContractGasCalculator.java index 763e5cde4778..11fdf051f3cc 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/SystemContractGasCalculator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/SystemContractGasCalculator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaNativeOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaNativeOperations.java index 9ef344adbc56..500e5ac627ab 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaNativeOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaNativeOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.annotations.TransactionScope; import com.hedera.node.app.service.schedule.ReadableScheduleStore; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaOperations.java index d2fd5225b76d..901c613cc34a 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ import com.hedera.hapi.node.base.Duration; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Key; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.annotations.TransactionScope; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.TinybarValues; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleSystemContractOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleSystemContractOperations.java index 4c5b78673a52..6f9b35d0d5b7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleSystemContractOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleSystemContractOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,11 +28,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.ExchangeRate; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.annotations.TransactionScope; import com.hedera.node.app.service.contract.impl.records.ContractCallStreamBuilder; import com.hedera.node.app.spi.workflows.DispatchOptions.StakingRewards; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/QuerySystemContractOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/QuerySystemContractOperations.java index bab457723702..b1174e22bc54 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/QuerySystemContractOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/QuerySystemContractOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,9 +24,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.ExchangeRate; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.annotations.QueryScope; import com.hedera.node.app.service.contract.impl.records.ContractCallStreamBuilder; import com.hedera.node.app.spi.workflows.DispatchOptions.UsePresetTxnId; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/SystemContractOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/SystemContractOperations.java index 2db9ff1d47b7..190482417b99 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/SystemContractOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/SystemContractOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,9 +24,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.ExchangeRate; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.records.ContractCallStreamBuilder; import com.hedera.node.app.spi.workflows.DispatchOptions.UsePresetTxnId; import com.hedera.node.app.spi.workflows.record.StreamBuilder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/PrngSystemContract.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/PrngSystemContract.java index fa01521cdae8..af24bb8cb563 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/PrngSystemContract.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/PrngSystemContract.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,8 +29,8 @@ import static org.hyperledger.besu.evm.frame.ExceptionalHaltReason.INVALID_OPERATION; import com.hedera.hapi.node.base.ContractID; -import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.util.UtilPrngTransactionBody; import com.hedera.node.app.hapi.utils.InvalidTransactionException; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveCall.java index 8335e8850e3f..8fb1991073da 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveTranslator.java index 92f0e8416260..375273ff8ae1 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.CryptoAllowance; import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.Call; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.HasCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCall.java index 9367835994ef..944d03c02905 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsTranslator.java index e5ed2f26737a..e5771f08633b 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ import static java.util.Objects.requireNonNull; import com.esaulpaugh.headlong.abi.Function; -import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.Call; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.HasCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/DispatchForResponseCodeHssCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/DispatchForResponseCodeHssCall.java index ca229467023f..74a6640cdb39 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/DispatchForResponseCodeHssCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/DispatchForResponseCodeHssCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeCall.java index 27fea705bec1..b675d85c972f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,9 +27,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.scheduled.ScheduleCreateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslator.java index fecbe9aaf444..171b1fd656d3 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/signschedule/SignScheduleTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/signschedule/SignScheduleTranslator.java index 03adf08572cd..534622f3fbdc 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/signschedule/SignScheduleTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/signschedule/SignScheduleTranslator.java @@ -34,8 +34,8 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.SignatureMap; -import com.hedera.hapi.node.scheduled.ScheduleSignTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.scheduled.ScheduleSignTransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AddressIdConverter.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AddressIdConverter.java index 25d936e68012..8e6bd2bba306 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AddressIdConverter.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AddressIdConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/DispatchForResponseCodeHtsCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/DispatchForResponseCodeHtsCall.java index be82f9c22508..c09df72cb0a6 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/DispatchForResponseCodeHtsCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/DispatchForResponseCodeHtsCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,8 +28,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropDecoder.java index c10ee1b08ab9..b799fafe1393 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,8 +25,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.NftTransfer; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.token.TokenAirdropTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.TokenAirdropTransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropTranslator.java index 07e8646ce37c..b3f9004e715c 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsDecoder.java index 3c75733150cc..be24daaa92b6 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ import static java.util.Objects.requireNonNull; import com.esaulpaugh.headlong.abi.Address; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; import com.hedera.hapi.node.token.TokenDissociateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsTranslator.java index 791f59a2e9ec..99154be159c2 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnDecoder.java index 7a53d12493da..71b0267e6082 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,8 +25,8 @@ import com.esaulpaugh.headlong.abi.TupleType; import com.google.common.primitives.Longs; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.token.TokenBurnTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.TokenBurnTransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.DispatchForResponseCodeHtsCall; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnTranslator.java index fdf1b64334f6..338be078ed1f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropDecoder.java index 5309cca03520..cf29d0b01250 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ import com.esaulpaugh.headlong.abi.Address; import com.esaulpaugh.headlong.abi.Tuple; -import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.config.data.TokensConfig; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslator.java index 7ac716d98c42..6e129ba8bd2a 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropDecoder.java index 9054c592a483..6f27339b1d29 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ import com.esaulpaugh.headlong.abi.Address; import com.esaulpaugh.headlong.abi.Tuple; -import com.hedera.hapi.node.token.TokenClaimAirdropTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.TokenClaimAirdropTransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.config.data.TokensConfig; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslator.java index b9e6df1974b5..90bcc9d863ba 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/ClassicCreatesCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/ClassicCreatesCall.java index c460057ba7cd..a7edabec60a1 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/ClassicCreatesCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/ClassicCreatesCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,10 +45,10 @@ import com.hedera.hapi.node.base.ContractID; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.token.TokenCreateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.ActiveContractVerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.scope.ActiveContractVerificationStrategy.UseTopLevelSigs; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoder.java index 2624f219b099..074fad3bcdac 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,8 @@ import com.esaulpaugh.headlong.abi.Tuple; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Duration; -import com.hedera.hapi.node.token.TokenCreateTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.TokenCreateTransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoderFunction.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoderFunction.java index 679316bf8ec1..d76cdef0183e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoderFunction.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoderFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateTranslator.java index 09779f57dee6..f54b987ba25c 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/delete/DeleteTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/delete/DeleteTranslator.java index 48a0a8e26e5b..b0a014340011 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/delete/DeleteTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/delete/DeleteTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.token.TokenDeleteTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.TokenDeleteTransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoder.java index 8adfa1791f57..6d2faaaf37f7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,9 @@ package com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.freeze; import com.esaulpaugh.headlong.abi.Address; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenFreezeAccountTransactionBody; import com.hedera.hapi.node.token.TokenUnfreezeAccountTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeTranslator.java index a9297d5b1707..0b38fde3103e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/AbstractGrantApprovalCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/AbstractGrantApprovalCall.java index f8887b7a7484..5304011f9348 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/AbstractGrantApprovalCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/AbstractGrantApprovalCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,12 +23,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.CryptoDeleteAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.NftRemoveAllowance; import com.hedera.hapi.node.token.TokenAllowance; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoder.java index 05388e55e9a6..3642493831b4 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ package com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.grantapproval; import com.esaulpaugh.headlong.abi.Address; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalTranslator.java index a47d95d17d2a..12da6be52150 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoder.java index 5ffa9f5dc5de..ab1feaf313b1 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ import static com.hedera.node.app.service.contract.impl.utils.ConversionUtils.asTokenId; import com.esaulpaugh.headlong.abi.Address; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenGrantKycTransactionBody; import com.hedera.hapi.node.token.TokenRevokeKycTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycTranslator.java index 546852778bbe..527fa888b5c6 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintDecoder.java index a0e322b8ab5a..90c28eca859e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ import com.esaulpaugh.headlong.abi.Address; import com.esaulpaugh.headlong.abi.TupleType; -import com.hedera.hapi.node.token.TokenMintTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.TokenMintTransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.DispatchForResponseCodeHtsCall; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintTranslator.java index 579a2da86e29..c7bd9a633de6 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesDecoder.java index 613dd1b55342..5acd4e5e6010 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ import static com.hedera.node.app.service.contract.impl.utils.ConversionUtils.asTokenId; import com.esaulpaugh.headlong.abi.Address; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenPauseTransactionBody; import com.hedera.hapi.node.token.TokenUnpauseTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; import javax.inject.Inject; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesTranslator.java index 2ac759230909..a06cd9bcec34 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensDecoder.java index aa91ff0c9083..bf2d865b68f4 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,9 +23,9 @@ import com.esaulpaugh.headlong.abi.Address; import com.esaulpaugh.headlong.abi.Tuple; import com.hedera.hapi.node.base.NftID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenReference; import com.hedera.hapi.node.token.TokenRejectTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.config.data.LedgerConfig; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslator.java index b07b05b802c0..70478c3dcf68 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllCall.java index 7d4461bc45d0..c0c86c72e6ab 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoder.java index a8060194b8b9..3556e9571b37 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllTranslator.java index 851e3b1fe132..978737272fcd 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersCall.java index 6127f5aeefe0..acd051761fcb 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,9 +32,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersDecoder.java index 71ee62b0f036..4629586967ba 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersTranslator.java index bd57806af51b..d825db2e8952 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc20TransfersCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc20TransfersCall.java index 75d050453359..59532b085b13 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc20TransfersCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc20TransfersCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,9 +32,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc721TransferFromCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc721TransferFromCall.java index dbb8ae7972a8..e1cd14ad6ce3 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc721TransferFromCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc721TransferFromCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,8 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoder.java index 9d212c9029f7..c3a1fa5a79eb 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,11 +30,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenUpdateNftsTransactionBody; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; import com.hedera.hapi.node.token.TokenUpdateTransactionBody.Builder; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.DispatchForResponseCodeHtsCall; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoderFunction.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoderFunction.java index 7b1acb8bc399..8734850fcfb0 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoderFunction.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoderFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateExpiryTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateExpiryTranslator.java index b71e2698f8d3..b5649ead2812 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateExpiryTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateExpiryTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateKeysTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateKeysTranslator.java index 69750cea0a66..b7efcf62a6eb 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateKeysTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateKeysTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateNFTsMetadataTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateNFTsMetadataTranslator.java index 0baf1c29302c..783d81abbff0 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateNFTsMetadataTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateNFTsMetadataTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateTranslator.java index ffbb27a6bab2..2a47e67465c9 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesDecoder.java index 63e67372c26d..8e8cc9333428 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,12 +23,12 @@ import com.hedera.hapi.node.base.Fraction; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenFeeScheduleUpdateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; import com.hedera.hapi.node.transaction.FixedFee; import com.hedera.hapi.node.transaction.FractionalFee; import com.hedera.hapi.node.transaction.RoyaltyFee; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesTranslator.java index 6f70ed8e3942..e4fd74d35fc3 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeDecoder.java index fcd3ccb0ee9e..06053248adfc 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ import static com.hedera.node.app.service.contract.impl.utils.ConversionUtils.asTokenId; import com.esaulpaugh.headlong.abi.Address; -import com.hedera.hapi.node.token.TokenWipeAccountTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.TokenWipeAccountTransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeTranslator.java index 639ef79b5f40..f0cddc9892a6 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/SchedulingUtility.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/SchedulingUtility.java index c4a771214931..7fccf51b2d45 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/SchedulingUtility.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/SchedulingUtility.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,8 +17,8 @@ package com.hedera.node.app.service.contract.impl.exec.utils; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.node.app.spi.workflows.HandleException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/AbstractContractTransactionHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/AbstractContractTransactionHandler.java index df59d27ad1bb..9b3775b57362 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/AbstractContractTransactionHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/AbstractContractTransactionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCallHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCallHandler.java index 06df4ebe5d6d..ba6890941b8e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCallHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCallHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCreateHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCreateHandler.java index 192bf4af5b4e..cf0ec4e9e7ac 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCreateHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCreateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractDeleteHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractDeleteHandler.java index 3d8b3f4956f6..ccc74c9cabe8 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractDeleteHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractDeleteTransactionBody; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.fee.SmartContractFeeBuilder; import com.hedera.node.app.service.contract.impl.records.ContractDeleteStreamBuilder; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemDeleteHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemDeleteHandler.java index f579c55cd73c..fcfad94f1675 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemDeleteHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemUndeleteHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemUndeleteHandler.java index 6648575936a5..bc96e8909289 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemUndeleteHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemUndeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractUpdateHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractUpdateHandler.java index 021938e4a46f..81fb027583f7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractUpdateHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractUpdateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,9 +40,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractUpdateTransactionBody; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.hapi.utils.fee.SmartContractFeeBuilder; import com.hedera.node.app.service.contract.impl.records.ContractUpdateStreamBuilder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/EthereumTransactionHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/EthereumTransactionHandler.java index f3042ea02029..7d3bfdb19095 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/EthereumTransactionHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/EthereumTransactionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,8 +33,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.contract.EthereumTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.contract.EthereumTransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxSigs; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; import com.hedera.node.app.service.contract.impl.exec.TransactionComponent; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/infra/HevmTransactionFactory.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/infra/HevmTransactionFactory.java index a795e98cf11f..9c9f3b576323 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/infra/HevmTransactionFactory.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/infra/HevmTransactionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,10 +53,10 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Key; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.service.contract.impl.ContractServiceImpl; import com.hedera.node.app.service.contract.impl.annotations.InitialState; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/TestHelpers.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/TestHelpers.java index 4581ea84ef1e..42bde1983d21 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/TestHelpers.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/TestHelpers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,6 +49,7 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenSupplyType; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; @@ -65,7 +66,6 @@ import com.hedera.hapi.node.transaction.FixedFee; import com.hedera.hapi.node.transaction.FractionalFee; import com.hedera.hapi.node.transaction.RoyaltyFee; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.streams.CallOperationType; import com.hedera.hapi.streams.ContractAction; import com.hedera.hapi.streams.ContractActionType; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/ContextTransactionProcessorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/ContextTransactionProcessorTest.java index 43167a5dc3b3..68b98d14b3ea 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/ContextTransactionProcessorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/ContextTransactionProcessorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,9 +38,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TimestampSeconds; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.ExchangeRate; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.CallOutcome; import com.hedera.node.app.service.contract.impl.exec.ContextTransactionProcessor; import com.hedera.node.app.service.contract.impl.exec.TransactionProcessor; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/QueryModuleTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/QueryModuleTest.java index 5f5b019b7ffb..12f6bcea6b80 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/QueryModuleTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/QueryModuleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/TransactionModuleTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/TransactionModuleTest.java index 0312ccb66f5b..67d9a5c8fd78 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/TransactionModuleTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/TransactionModuleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,9 +36,9 @@ import static org.mockito.Mockito.verify; import com.hedera.hapi.node.base.AccountID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxSigs; import com.hedera.node.app.service.contract.impl.exec.FeatureFlags; import com.hedera.node.app.service.contract.impl.exec.TransactionModule; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/gas/SystemContractGasCalculatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/gas/SystemContractGasCalculatorTest.java index 8f3f07c1e99d..0b0e29e9f64f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/gas/SystemContractGasCalculatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/gas/SystemContractGasCalculatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaNativeOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaNativeOperationsTest.java index 6cd24cc55c44..211b37e2cf56 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaNativeOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaNativeOperationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,9 +53,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HandleHederaNativeOperations; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaOperationsTest.java index 0f528123fcdb..6db182c8967d 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaOperationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,13 +54,13 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.token.TokenCreateTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.TinybarValues; import com.hedera.node.app.service.contract.impl.exec.scope.HandleHederaOperations; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java index 92245b5d38f1..8f54c019c576 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,8 +40,8 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionID; import com.hedera.node.app.service.contract.impl.exec.scope.HandleSystemContractOperations; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy.Decision; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/QuerySystemContractOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/QuerySystemContractOperationsTest.java index 521bab6ee410..7d4a9fc8d5b5 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/QuerySystemContractOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/QuerySystemContractOperationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,9 +31,9 @@ import com.hedera.hapi.node.base.ContractID; import com.hedera.hapi.node.base.TimestampSeconds; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.ExchangeRate; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.QuerySystemContractOperations; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.spi.fees.ExchangeRateInfo; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/hbarApprove/HbarApproveCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/hbarApprove/HbarApproveCallTest.java index 2cf7f7b97b04..4031077f7d10 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/hbarApprove/HbarApproveCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/hbarApprove/HbarApproveCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCallTest.java index 4a914aeb44d6..bd0ec04d14d8 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/DispatchForResponseCodeHssCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/DispatchForResponseCodeHssCallTest.java index b945bae4d0e7..21880694bdec 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/DispatchForResponseCodeHssCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/DispatchForResponseCodeHssCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/signschedule/SignScheduleTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/signschedule/SignScheduleTranslatorTest.java index 2527ef9da78e..ec007e86d6a0 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/signschedule/SignScheduleTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/signschedule/SignScheduleTranslatorTest.java @@ -41,8 +41,8 @@ import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.SignaturePair; -import com.hedera.hapi.node.state.schedule.Schedule; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.schedule.Schedule; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/DispatchForResponseCodeHtsCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/DispatchForResponseCodeHtsCallTest.java index fa4523884802..8826cfb6fa30 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/DispatchForResponseCodeHtsCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/DispatchForResponseCodeHtsCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,9 +31,9 @@ import static org.mockito.Mockito.verifyNoInteractions; import com.hedera.hapi.node.base.AccountID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.token.TokenCreateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.DispatchForResponseCodeHtsCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/HtsCallAttemptTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/HtsCallAttemptTest.java index df905958407f..6bb67c8728d8 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/HtsCallAttemptTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/HtsCallAttemptTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,8 +36,8 @@ import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.verifyNoInteractions; -import com.hedera.hapi.node.token.TokenMintTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.TokenMintTransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategies; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.CallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/airdrops/TokenAirdropTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/airdrops/TokenAirdropTranslatorTest.java index 71e9a1d8b1ea..e2cf3e9a55e4 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/airdrops/TokenAirdropTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/airdrops/TokenAirdropTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsDecoderTest.java index 092821ea048d..c23d1d608391 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsTranslatorTest.java index 7f6189820de5..4b8abb72add2 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslatorTest.java index eb86e4a9b8bb..cffb508e24b6 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslatorTest.java index b0a99541d7e1..00b5c1fdeef1 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java index 927249842b92..7dfb9b869825 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,9 +38,9 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.token.TokenCreateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.create.ClassicCreatesCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/CreateDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/CreateDecoderTest.java index 4fc2d6f222bb..0938b3e6dbfa 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/CreateDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/CreateDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,8 +46,8 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.transaction.CustomFee; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.CustomFee; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.create.CreateDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoderTest.java index 071e1b88ab3b..7d820b9aaedf 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java index 46b3a52a28f0..e409ed46698a 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.state.token.Token; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.grantapproval.ERCGrantApprovalCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoderTest.java index 2537d0a7c3c8..775792b47dcd 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,9 +27,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.grantapproval.GrantApprovalDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoderTest.java index bb4615e03b97..0be83ad7f6a9 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/pauses/PausesDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/pauses/PausesDecoderTest.java index c95ea1d0bfe1..460c48cc9d08 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/pauses/PausesDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/pauses/PausesDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslatorTest.java index 1d8d99731024..13e38bae5c5e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,9 +29,9 @@ import static org.mockito.Mockito.verify; import com.hedera.hapi.node.base.AccountID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenReference; import com.hedera.hapi.node.token.TokenRejectTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllCallTest.java index 9ebcb4847357..92268502e7c5 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoderTest.java index 75eb5f47e77d..744ee93c3957 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersCallTest.java index 179a6b54ff69..5f46c6489081 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,8 +37,8 @@ import com.esaulpaugh.headlong.abi.TupleType; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.node.app.service.contract.impl.exec.failure.CustomExceptionalHaltReason; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersDecoderTest.java index d3072bc9c6e1..3121c64880fc 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersGasCalcTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersGasCalcTest.java index 6f221090ce14..d832d283799f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersGasCalcTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersGasCalcTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,9 +23,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.NftTransfer; import com.hedera.hapi.node.base.TokenTransferList; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.transfer.ClassicTransfersCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc20TransfersCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc20TransfersCallTest.java index 106bc7652786..830f9b8a0f32 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc20TransfersCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc20TransfersCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc721TransferFromCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc721TransferFromCallTest.java index ff0b5255b535..617538eba2a3 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc721TransferFromCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc721TransferFromCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,8 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.token.Account; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.transfer.Erc721TransferFromCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/update/UpdateTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/update/UpdateTranslatorTest.java index e4b8813ee8d5..c71fad3dcf7b 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/update/UpdateTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/update/UpdateTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,8 +44,8 @@ import static org.mockito.Mockito.verifyNoInteractions; import com.esaulpaugh.headlong.abi.Tuple; -import com.hedera.hapi.node.token.TokenUpdateTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.TokenUpdateTransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategies; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCallHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCallHandlerTest.java index 100b30bc0091..e86ac0827389 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCallHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCallHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,9 +29,9 @@ import static org.mockito.Mockito.mock; import com.hedera.hapi.node.base.HederaFunctionality; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; import com.hedera.node.app.service.contract.impl.exec.CallOutcome; import com.hedera.node.app.service.contract.impl.exec.ContextTransactionProcessor; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCreateHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCreateHandlerTest.java index ae597caeeff4..1e99c595e536 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCreateHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCreateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Key; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; import com.hedera.node.app.service.contract.impl.exec.CallOutcome; import com.hedera.node.app.service.contract.impl.exec.ContextTransactionProcessor; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractDeleteHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractDeleteHandlerTest.java index 009e5d7ea8ac..c9c1794dfa36 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractDeleteHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractDeleteHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,9 +39,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ContractID; import com.hedera.hapi.node.base.Key; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractDeleteTransactionBody; import com.hedera.hapi.node.state.token.Account; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.handlers.ContractDeleteHandler; import com.hedera.node.app.service.contract.impl.records.ContractDeleteStreamBuilder; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractUpdateHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractUpdateHandlerTest.java index 73b12a1b127f..973eff1aff03 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractUpdateHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractUpdateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,11 +52,11 @@ import com.hedera.hapi.node.base.Duration; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractUpdateTransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Account.Builder; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.handlers.ContractUpdateHandler; import com.hedera.node.app.service.contract.impl.records.ContractUpdateStreamBuilder; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/EthereumTransactionHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/EthereumTransactionHandlerTest.java index 4d87613b6d40..6be8e9545e12 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/EthereumTransactionHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/EthereumTransactionHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,9 +38,9 @@ import static org.mockito.Mockito.verifyNoInteractions; import com.hedera.hapi.node.base.AccountID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.EthereumTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; import com.hedera.node.app.service.contract.impl.exec.CallOutcome; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java index e4f03867b87a..ec00a54f33d0 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ import com.hedera.hapi.node.base.QueryHeader; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallLocalQuery; import com.hedera.hapi.node.transaction.Query; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.contract.impl.infra.HevmStaticTransactionFactory; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.HandleException; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmTransactionFactoryTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmTransactionFactoryTest.java index af88f7277aa7..53044b318011 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmTransactionFactoryTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmTransactionFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -81,12 +81,12 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.ResponseCodeEnum; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; import com.hedera.hapi.node.state.file.File; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.hapi.utils.ethereum.EthTxSigs; import com.hedera.node.app.service.contract.impl.exec.FeatureFlags; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/CryptoSignatureWaiversImpl.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/CryptoSignatureWaiversImpl.java index 39e4055827cd..2b1e1dd551fe 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/CryptoSignatureWaiversImpl.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/CryptoSignatureWaiversImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2024 Hedera Hashgraph, LLC + * Copyright (C) 2020-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoAddLiveHashHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoAddLiveHashHandler.java index f92b53f4725e..89066ebd5660 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoAddLiveHashHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoAddLiveHashHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoApproveAllowanceHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoApproveAllowanceHandler.java index 60cc80f48fec..39c225d8652c 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoApproveAllowanceHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoApproveAllowanceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,6 +44,7 @@ import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.AccountApprovalForAllAllowance; import com.hedera.hapi.node.state.token.AccountCryptoAllowance; @@ -52,7 +53,6 @@ import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java index 3e2f05612174..f584fc57a33d 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,10 +65,10 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteAllowanceHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteAllowanceHandler.java index 484c2db4fac2..41b9456484c9 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteAllowanceHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteAllowanceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,9 @@ import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.NftRemoveAllowance; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteHandler.java index 1db4f1799c66..b68147a6f1ac 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteLiveHashHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteLiveHashHandler.java index 9eb2e0dbd737..db9df51f0225 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteLiveHashHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteLiveHashHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferHandler.java index 463371c1852f..a821b9b4f7b9 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,13 +39,13 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.AssessedCustomFee; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoUpdateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoUpdateHandler.java index c6bd46cac324..3e62c987e87f 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoUpdateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoUpdateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,9 +48,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.CryptoSignatureWaivers; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAccountWipeHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAccountWipeHandler.java index b389afd39df5..be170b6aa241 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAccountWipeHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAccountWipeHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,10 +37,10 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAirdropHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAirdropHandler.java index 8abf1930981f..c9e9c8c292c5 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAirdropHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAirdropHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,10 +46,10 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.AccountPendingAirdrop; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAirdropStore; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAssociateToAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAssociateToAccountHandler.java index 4911299c330b..8dbd167367c3 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAssociateToAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAssociateToAccountHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,9 +36,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.TxnUsageEstimator; import com.hedera.node.app.hapi.fees.usage.token.TokenAssociateUsage; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenBurnHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenBurnHandler.java index ae47f3a44695..1c718c536dc5 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenBurnHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenBurnHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,9 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableTokenRelationStore; import com.hedera.node.app.service.token.ReadableTokenStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCancelAirdropHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCancelAirdropHandler.java index e85d5f934a2c..616486e11d65 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCancelAirdropHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCancelAirdropHandler.java @@ -37,8 +37,8 @@ import com.hedera.hapi.node.base.PendingAirdropId; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableAirdropStore; import com.hedera.node.app.service.token.impl.util.PendingAirdropUpdater; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenClaimAirdropHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenClaimAirdropHandler.java index 0d91f728343e..632e77e11494 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenClaimAirdropHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenClaimAirdropHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.token.TokenClaimAirdropTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableAirdropStore; import com.hedera.node.app.service.token.ReadableTokenStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCreateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCreateHandler.java index 6eca6a713ece..34aef167c3a0 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCreateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCreateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenCreateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDeleteHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDeleteHandler.java index dac135e1e657..8c388beaaa1f 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDeleteHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,8 +27,8 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.token.Token; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenDeleteUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDissociateFromAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDissociateFromAccountHandler.java index 8fc8afffb0bf..4dfe3d580e15 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDissociateFromAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDissociateFromAccountHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,11 +40,11 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenDissociateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenDissociateUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFeeScheduleUpdateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFeeScheduleUpdateHandler.java index 33e639a2e20a..4a836dbfc813 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFeeScheduleUpdateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFeeScheduleUpdateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,10 +31,10 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenFeeScheduleUpdateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.token.TokenOpsUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFreezeAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFreezeAccountHandler.java index cbab302a8642..c05d1dcc2ea7 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFreezeAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFreezeAccountHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,9 +27,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenFreezeAccountTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenGrantKycToAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenGrantKycToAccountHandler.java index ce9c583a5e33..411fee0f704f 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenGrantKycToAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenGrantKycToAccountHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,8 +28,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenGrantKycUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenMintHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenMintHandler.java index b3a98416949f..596986cc5cb8 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenMintHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenMintHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,10 +42,10 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenPauseHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenPauseHandler.java index daef0725d9fb..75b4667a4209 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenPauseHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenPauseHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRejectHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRejectHandler.java index 8bd4dd42f37a..d0baabbec072 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRejectHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRejectHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,9 +53,9 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.TokenReference; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRevokeKycFromAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRevokeKycFromAccountHandler.java index 7c4a7efb350e..e7548458b744 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRevokeKycFromAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRevokeKycFromAccountHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,8 +28,8 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenRevokeKycUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnfreezeAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnfreezeAccountHandler.java index ea8d55bad665..0b410f1d11c1 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnfreezeAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnfreezeAccountHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,9 +28,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUnfreezeAccountTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnpauseHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnpauseHandler.java index 6272eb03b98b..b18eb93709c0 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnpauseHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnpauseHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateHandler.java index 85ad4c7a14ba..af415968ea72 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,11 +45,11 @@ import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.ThresholdKey; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenUpdateUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateNftsHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateNftsHandler.java index 41125276363f..0f86ce17d6c0 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateNftsHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateNftsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,9 +31,9 @@ import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.token.TokenUpdateNftsTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableNftStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/staking/EndOfStakingPeriodUtils.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/staking/EndOfStakingPeriodUtils.java index 08ea3e8fee54..7c926ece37f4 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/staking/EndOfStakingPeriodUtils.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/staking/EndOfStakingPeriodUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,11 +21,11 @@ import com.hedera.hapi.node.base.Fraction; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.NetworkStakingRewards; import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.transaction.NodeStake; import com.hedera.hapi.node.transaction.NodeStakeUpdateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableNetworkStakingRewardsStore; import com.hedera.node.config.data.StakingConfig; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AssociateTokenRecipientsStep.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AssociateTokenRecipientsStep.java index 475c8b5104d1..058a5297da5b 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AssociateTokenRecipientsStep.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AssociateTokenRecipientsStep.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,11 +37,11 @@ import com.hedera.hapi.node.base.NftTransfer; import com.hedera.hapi.node.base.TokenAssociation; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AutoAccountCreator.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AutoAccountCreator.java index 55d2a8950a82..70d9631685e0 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AutoAccountCreator.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AutoAccountCreator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,8 @@ import com.hedera.hapi.node.base.Duration; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.records.CryptoCreateStreamBuilder; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/TransferExecutor.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/TransferExecutor.java index 04b3e9d95ff4..cbaa00b2c541 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/TransferExecutor.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/TransferExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,9 @@ import com.hedera.hapi.node.base.NftTransfer; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.handlers.BaseTokenHandler; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/CryptoSignatureWaiversImplTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/CryptoSignatureWaiversImplTest.java index 3c730667d60d..c644457a4861 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/CryptoSignatureWaiversImplTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/CryptoSignatureWaiversImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2024 Hedera Hashgraph, LLC + * Copyright (C) 2020-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.AccountID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.authorization.AuthorizerImpl; import com.hedera.node.app.authorization.PrivilegesVerifier; import com.hedera.node.app.service.token.impl.CryptoSignatureWaiversImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoAddLiveHashHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoAddLiveHashHandlerTest.java index e3610f3e23bf..b25d85811d2d 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoAddLiveHashHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoAddLiveHashHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoApproveAllowanceHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoApproveAllowanceHandlerTest.java index 607cea5cc6a0..5f0b53dd9905 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoApproveAllowanceHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoApproveAllowanceHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,6 +41,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; @@ -48,7 +49,6 @@ import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.ReadableAccountStoreImpl; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoCreateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoCreateHandlerTest.java index 3dd2e01adb5b..0fdc3ae2b048 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoCreateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoCreateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,11 +61,11 @@ import com.hedera.hapi.node.base.Duration; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.primitives.ProtoBytes; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.handlers.CryptoCreateHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoHandlerTestBase; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteAllowanceHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteAllowanceHandlerTest.java index d05630caf533..e8dec56ae216 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteAllowanceHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteAllowanceHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ import static org.mockito.Mockito.mock; import com.hedera.hapi.node.base.AccountID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoDeleteAllowanceTransactionBody; import com.hedera.hapi.node.token.NftRemoveAllowance; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.CryptoDeleteAllowanceHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; import com.hedera.node.app.service.token.impl.validators.DeleteAllowanceValidator; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteHandlerTest.java index ef010aa14678..8fbae5ca730a 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,11 +44,11 @@ import static org.mockito.Mockito.verify; import com.hedera.hapi.node.base.AccountID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.primitives.ProtoBytes; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoDeleteTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.api.TokenServiceApi; import com.hedera.node.app.service.token.impl.ReadableAccountStoreImpl; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerPureChecksTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerPureChecksTest.java index 75e3dc3f8588..7b40527598d5 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerPureChecksTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerPureChecksTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,9 +29,9 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.pbj.runtime.io.buffer.Bytes; import java.util.Collections; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTest.java index 5d736773db0d..dc302f9c22b8 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,12 +49,12 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTestBase.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTestBase.java index f6744af0e5f7..1f4be35508dc 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTestBase.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,13 +26,13 @@ import com.hedera.hapi.node.base.NftTransfer; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.token.TokenAirdropTransactionBody; import com.hedera.hapi.node.token.TokenClaimAirdropTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.CryptoTransferHandler; import com.hedera.node.app.service.token.impl.handlers.TokenAirdropHandler; import com.hedera.node.app.service.token.impl.handlers.TokenClaimAirdropHandler; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java index 01c0936132d0..016c3e8f205b 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,10 +57,10 @@ import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.ThresholdKey; import com.hedera.hapi.node.base.Timestamp; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.CryptoSignatureWaiversImpl; import com.hedera.node.app.service.token.impl.ReadableAccountStoreImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAccountWipeHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAccountWipeHandlerTest.java index 0ed820bab7c5..f570dada898c 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAccountWipeHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAccountWipeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,6 +49,7 @@ import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; @@ -56,7 +57,6 @@ import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenBurnTransactionBody; import com.hedera.hapi.node.token.TokenWipeAccountTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAirdropHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAirdropHandlerTest.java index 660c2dfc1929..09a58235086d 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAirdropHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAirdropHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,10 +46,10 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.AccountPendingAirdrop; import com.hedera.hapi.node.token.TokenAirdropTransactionBody; import com.hedera.hapi.node.transaction.PendingAirdropRecord; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.FeeContextImpl; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAirdropStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAssociateToAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAssociateToAccountHandlerTest.java index d6155eb58258..a3a1c264f86c 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAssociateToAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAssociateToAccountHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,12 +45,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.common.EntityIDPair; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenBurnHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenBurnHandlerTest.java index 50afd534b407..d98ce7c0dcf4 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenBurnHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenBurnHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,6 +55,7 @@ import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; @@ -62,7 +63,6 @@ import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; import com.hedera.hapi.node.token.TokenBurnTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerPureChecksTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerPureChecksTest.java index bd613d107648..407009c6c8ba 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerPureChecksTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerPureChecksTest.java @@ -31,9 +31,9 @@ import com.hedera.hapi.node.base.PendingAirdropId; import com.hedera.hapi.node.base.PendingAirdropId.TokenReferenceOneOfType; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.TokenCancelAirdropHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; import com.hedera.node.app.service.token.impl.util.PendingAirdropUpdater; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerTest.java index a9502419b01e..be39a3e75c3e 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.PendingAirdropId; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableAirdropStore; import com.hedera.node.app.service.token.impl.handlers.TokenCancelAirdropHandler; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java index 86fa57911186..4f11b65f096c 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,11 +65,11 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenSupplyType; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenCreateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.handlers.TokenCreateHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDeleteHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDeleteHandlerTest.java index d50f9fcafe07..601fd3a09ae5 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDeleteHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDeleteHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,10 +30,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenDeleteTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableTokenStore; import com.hedera.node.app.service.token.impl.handlers.BaseCryptoHandler; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDissociateFromAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDissociateFromAccountHandlerTest.java index 758abd9a9f35..990e18abd6b5 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDissociateFromAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDissociateFromAccountHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,12 +44,12 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenDissociateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFeeScheduleUpdateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFeeScheduleUpdateHandlerTest.java index e6ba33856f68..acdbb7a43a5d 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFeeScheduleUpdateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFeeScheduleUpdateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,11 +37,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenFeeScheduleUpdateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.FeeContextImpl; import com.hedera.node.app.fees.FeeManager; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFreezeAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFreezeAccountHandlerTest.java index 7132d14270c3..ead8359a3ace 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFreezeAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFreezeAccountHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,12 +39,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenFreezeAccountTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenGrantKycToAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenGrantKycToAccountHandlerTest.java index 8c5f694905a1..d07e9fe42384 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenGrantKycToAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenGrantKycToAccountHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,12 +37,12 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenSupplyType; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenGrantKycTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.ReadableTokenStoreImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java index a27af9e0ac72..fdc401c52916 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,9 +40,9 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.TokenMintTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.handlers.TokenMintHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenPauseHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenPauseHandlerTest.java index 7058f7b68e54..cb6250cbb14e 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenPauseHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenPauseHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenPauseTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.ReadableTokenStoreImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRejectHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRejectHandlerTest.java index aaac9036dcf5..0540a9af3c3f 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRejectHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRejectHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.SubType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.TokenReference; import com.hedera.hapi.node.token.TokenRejectTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.fees.FeeContextImpl; import com.hedera.node.app.service.token.impl.handlers.TokenRejectHandler; import com.hedera.node.app.spi.fees.FeeCalculator; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRevokeKycFromAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRevokeKycFromAccountHandlerTest.java index 6e41529c033e..b678aef65953 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRevokeKycFromAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRevokeKycFromAccountHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,12 +37,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenRevokeKycTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnfreezeAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnfreezeAccountHandlerTest.java index 0d7418ad513a..55bb7d2e432c 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnfreezeAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnfreezeAccountHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,12 +39,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUnfreezeAccountTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnpauseHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnpauseHandlerTest.java index a52882809426..3168158388a4 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnpauseHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnpauseHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,11 +35,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenUnpauseTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.ReadableTokenStoreImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateHandlerTest.java index 1310ae54b91d..03d856c96414 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -67,10 +67,10 @@ import com.hedera.hapi.node.base.TokenAssociation; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenKeyValidation; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; import com.hedera.node.app.service.token.ReadableTokenStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateNftsHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateNftsHandlerTest.java index 827195007f4e..1a6fd7aa1682 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateNftsHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateNftsHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,12 +42,12 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUpdateNftsTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/EndOfStakingPeriodUpdaterTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/EndOfStakingPeriodUpdaterTest.java index ffca84d412d3..1d67ecb56860 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/EndOfStakingPeriodUpdaterTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/EndOfStakingPeriodUpdaterTest.java @@ -32,13 +32,13 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.NetworkStakingRewards; import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableNetworkStakingRewardsStore; import com.hedera.node.app.service.token.impl.WritableStakingInfoStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/StakeInfoHelperTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/StakeInfoHelperTest.java index 980eb22f69ae..42a6fe2c1449 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/StakeInfoHelperTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/StakeInfoHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ import static org.mockito.Mockito.verify; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableNetworkStakingRewardsStore; import com.hedera.node.app.service.token.impl.WritableStakingInfoStore; import com.hedera.node.app.service.token.impl.handlers.staking.StakeInfoHelper; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/StepsBase.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/StepsBase.java index 80e1b7a2bf44..296e001f16e9 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/StepsBase.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/StepsBase.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,13 +31,13 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.PendingAirdropId; import com.hedera.hapi.node.base.TokenTransferList; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.state.primitives.ProtoBytes; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.token.TokenAirdropTransactionBody; import com.hedera.hapi.node.token.TokenClaimAirdropTransactionBody; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.handlers.transfer.AdjustFungibleTokenChangesStep; import com.hedera.node.app.service.token.impl.handlers.transfer.AdjustHbarChangesStep; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/ApproveAllowanceValidatorTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/ApproveAllowanceValidatorTest.java index 6a08ef460c45..7ff66522e8f1 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/ApproveAllowanceValidatorTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/ApproveAllowanceValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,13 +26,13 @@ import static org.mockito.Mock.Strictness.LENIENT; import com.hedera.hapi.node.base.AccountID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.AccountApprovalForAllAllowance; import com.hedera.hapi.node.token.CryptoAllowance; import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; import com.hedera.node.app.service.token.impl.validators.ApproveAllowanceValidator; import com.hedera.node.app.spi.validation.ExpiryValidator; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/DeleteAllowanceValidatorTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/DeleteAllowanceValidatorTest.java index 67f0f46f9a84..7a893420783d 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/DeleteAllowanceValidatorTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/DeleteAllowanceValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,10 +29,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoDeleteAllowanceTransactionBody; import com.hedera.hapi.node.token.NftRemoveAllowance; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; import com.hedera.node.app.service.token.impl.validators.DeleteAllowanceValidator; import com.hedera.node.app.spi.validation.ExpiryValidator; diff --git a/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/CryptoSignatureWaivers.java b/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/CryptoSignatureWaivers.java index 873303828010..d04c8b171d73 100644 --- a/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/CryptoSignatureWaivers.java +++ b/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/CryptoSignatureWaivers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2024 Hedera Hashgraph, LLC + * Copyright (C) 2021-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/api/TokenServiceApi.java b/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/api/TokenServiceApi.java index 265fe035a229..c9e65621624c 100644 --- a/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/api/TokenServiceApi.java +++ b/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/api/TokenServiceApi.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilPrngHandler.java b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilPrngHandler.java index 44d906a3f033..2b795b61b6f1 100644 --- a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilPrngHandler.java +++ b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilPrngHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilPrngHandlerTest.java b/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilPrngHandlerTest.java index 52362ede4476..c43a15cd53f9 100644 --- a/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilPrngHandlerTest.java +++ b/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilPrngHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/BlockTransactionParts.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/BlockTransactionParts.java index 34db232c9977..05a158deda88 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/BlockTransactionParts.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/BlockTransactionParts.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ import com.hedera.hapi.node.base.TokenAssociation; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.transaction.AssessedCustomFee; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.pbj.runtime.io.buffer.Bytes; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/TransactionParts.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/TransactionParts.java index 9602c96c1956..21f90f84930b 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/TransactionParts.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/TransactionParts.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.SignedTransaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.pbj.runtime.ParseException; import com.hedera.pbj.runtime.io.buffer.Bytes; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/validators/block/BlockItemNonceValidator.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/validators/block/BlockItemNonceValidator.java index b2d9177a3216..10e67fe40875 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/validators/block/BlockItemNonceValidator.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/validators/block/BlockItemNonceValidator.java @@ -19,8 +19,8 @@ import com.hedera.hapi.block.stream.Block; import com.hedera.hapi.block.stream.BlockItem; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.base.TransactionID; import com.hedera.pbj.runtime.ParseException; import com.hedera.pbj.runtime.io.buffer.Bytes; import com.hedera.services.bdd.junit.support.BlockStreamValidator; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/EmbeddedVerbs.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/EmbeddedVerbs.java index d1040c3a0ed5..2e5c85a18aa0 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/EmbeddedVerbs.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/EmbeddedVerbs.java @@ -25,6 +25,7 @@ import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.TimestampSeconds; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.addressbook.Node; import com.hedera.hapi.node.state.blockrecords.BlockInfo; @@ -34,7 +35,6 @@ import com.hedera.hapi.node.state.token.AccountPendingAirdrop; import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.state.token.Token; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.throttle.ThrottleAccumulator; import com.hedera.node.app.workflows.TransactionInfo; From 7c836a9aa4dc1bd809119506282babea5b2aab0d Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Tue, 14 Jan 2025 13:52:44 -0800 Subject: [PATCH 09/21] Deleted accidentally added file Signed-off-by: Kim Rader --- .../services/atomic_batch.proto | 44 ------------------- 1 file changed, 44 deletions(-) delete mode 100644 hapi/hedera-protobufs/services/atomic_batch.proto diff --git a/hapi/hedera-protobufs/services/atomic_batch.proto b/hapi/hedera-protobufs/services/atomic_batch.proto deleted file mode 100644 index 74eed67eeacc..000000000000 --- a/hapi/hedera-protobufs/services/atomic_batch.proto +++ /dev/null @@ -1,44 +0,0 @@ -/** - * # Atomic Batch - * A transaction that groups multiple transactions together, and executes - * them atomically. - * - * ### 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; - -/* - * Copyright (C) 2018-2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -option java_package = "com.hederahashgraph.api.proto.java"; -// <<>> This comment is special code for setting PBJ Compiler java package -option java_multiple_files = true; - -import "transaction.proto"; - -/** - * Create an atomic batch. - */ -message AtomicBatchTransactionBody { - repeated Transaction transactions = 1; -} From e351c4db8627cd8959a9adde4df502323be98ef7 Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Sat, 11 Jan 2025 21:50:28 -0800 Subject: [PATCH 10/21] Rebase to get latest changes from 17360-avoid-circular-dependency Signed-off-by: Kim Rader --- .../services/atomic_batch.proto | 44 +++++++++ .../services/basic_types.proto | 5 + .../services/response_code.proto | 15 +++ .../services/transaction_body.proto | 0 .../services/util_service.proto | 10 ++ .../java/com/hedera/hapi/util/HapiUtils.java | 19 ++-- .../app/workflows/TransactionChecker.java | 2 +- .../node/app/workflows/TransactionInfo.java | 3 +- .../dispatcher/TransactionDispatcher.java | 1 + .../dispatcher/TransactionHandlers.java | 4 +- .../handle/HandleWorkflowModule.java | 3 +- .../app/blocks/BlockStreamBuilderTest.java | 7 +- .../app/throttle/ThrottleAccumulatorTest.java | 5 +- .../app/workflows/TransactionCheckerTest.java | 99 ------------------- .../workflows/TransactionScenarioBuilder.java | 1 - .../handle/DispatchHandleContextTest.java | 14 +-- .../handle/dispatch/RecordFinalizerTest.java | 2 +- .../steps/HollowAccountCompletionsTest.java | 4 +- .../steps/PlatformStateUpdatesTest.java | 4 +- .../handle/steps/SystemFileUpdatesTest.java | 3 +- .../ingest/IngestWorkflowImplTest.java | 2 +- .../node/config/data/ApiPermissionConfig.java | 4 + .../test/handlers/TokenMintHandlerTest.java | 2 +- .../impl/handlers/AtomicBatchHandler.java | 72 ++++++++++++++ .../util/impl/handlers/UtilHandlers.java | 11 ++- .../impl/test/handlers/UtilHandlersTest.java | 11 ++- .../service/util/UtilServiceDefinition.java | 7 +- .../util/UtilServiceDefinitionTest.java | 5 +- 28 files changed, 208 insertions(+), 151 deletions(-) create mode 100644 hapi/hedera-protobufs/services/atomic_batch.proto create mode 100644 hapi/hedera-protobufs/services/transaction_body.proto create mode 100644 hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java diff --git a/hapi/hedera-protobufs/services/atomic_batch.proto b/hapi/hedera-protobufs/services/atomic_batch.proto new file mode 100644 index 000000000000..74eed67eeacc --- /dev/null +++ b/hapi/hedera-protobufs/services/atomic_batch.proto @@ -0,0 +1,44 @@ +/** + * # Atomic Batch + * A transaction that groups multiple transactions together, and executes + * them atomically. + * + * ### 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; + +/* + * Copyright (C) 2018-2024 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +option java_package = "com.hederahashgraph.api.proto.java"; +// <<>> This comment is special code for setting PBJ Compiler java package +option java_multiple_files = true; + +import "transaction.proto"; + +/** + * Create an atomic batch. + */ +message AtomicBatchTransactionBody { + repeated Transaction transactions = 1; +} diff --git a/hapi/hedera-protobufs/services/basic_types.proto b/hapi/hedera-protobufs/services/basic_types.proto index 298fa5245eb3..3b1430d86cfd 100644 --- a/hapi/hedera-protobufs/services/basic_types.proto +++ b/hapi/hedera-protobufs/services/basic_types.proto @@ -1652,6 +1652,11 @@ enum HederaFunctionality { * Submit a signature of a state root hash gossiped to other nodes */ StateSignatureTransaction = 100; + + /** + * Submit a batch of transactions to run atomically + */ + AtomicBatch = 101; } /** diff --git a/hapi/hedera-protobufs/services/response_code.proto b/hapi/hedera-protobufs/services/response_code.proto index 0157876e2be7..46b0cb50928c 100644 --- a/hapi/hedera-protobufs/services/response_code.proto +++ b/hapi/hedera-protobufs/services/response_code.proto @@ -1640,4 +1640,19 @@ enum ResponseCodeEnum { * approximately four million times with typical network configuration.) */ RECURSIVE_SCHEDULING_LIMIT_REACHED = 374; + + /** + * The list of batch transactions is empty + */ + BATCH_LIST_EMPTY = 375; + + /** + * The list of batch transactions contains duplicated transactions + */ + BATCH_LIST_CONTAINS_DUPLICATES = 376; + + /** + * The list of batch transactions contains null values + */ + BATCH_LIST_CONTAINS_NULL_VALUES = 377; } diff --git a/hapi/hedera-protobufs/services/transaction_body.proto b/hapi/hedera-protobufs/services/transaction_body.proto new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/hapi/hedera-protobufs/services/util_service.proto b/hapi/hedera-protobufs/services/util_service.proto index e55f1f2c9388..8596bc1be9bf 100644 --- a/hapi/hedera-protobufs/services/util_service.proto +++ b/hapi/hedera-protobufs/services/util_service.proto @@ -55,4 +55,14 @@ service UtilService { * [UtilPrngTransactionBody](#proto.UtilPrngTransactionBody) */ rpc prng (Transaction) returns (TransactionResponse); + + + /** + * Execute a batch of transactions atomically. + *

+ * All transactions in the batch will be executed in order, and if any + * transaction fails, the entire batch will fail. + // TODO: Add more details about the batch transaction + */ + rpc atomicBatch (Transaction) returns (TransactionResponse); } diff --git a/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java b/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java index b981078f8e40..6baf61b17392 100644 --- a/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java +++ b/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java @@ -179,6 +179,7 @@ public static int countOfCryptographicKeys(@NonNull final Key key) { public static HederaFunctionality functionOf(final TransactionBody txn) throws UnknownHederaFunctionality { return switch (txn.data().kind()) { + case ATOMIC_BATCH -> HederaFunctionality.ATOMIC_BATCH; case CONSENSUS_CREATE_TOPIC -> HederaFunctionality.CONSENSUS_CREATE_TOPIC; case CONSENSUS_UPDATE_TOPIC -> HederaFunctionality.CONSENSUS_UPDATE_TOPIC; case CONSENSUS_DELETE_TOPIC -> HederaFunctionality.CONSENSUS_DELETE_TOPIC; @@ -201,14 +202,21 @@ public static HederaFunctionality functionOf(final TransactionBody txn) throws U case FILE_UPDATE -> HederaFunctionality.FILE_UPDATE; case FILE_DELETE -> HederaFunctionality.FILE_DELETE; case FREEZE -> HederaFunctionality.FREEZE; + case NODE_CREATE -> HederaFunctionality.NODE_CREATE; + case NODE_DELETE -> HederaFunctionality.NODE_DELETE; case NODE_STAKE_UPDATE -> HederaFunctionality.NODE_STAKE_UPDATE; + case NODE_UPDATE -> HederaFunctionality.NODE_UPDATE; case SCHEDULE_CREATE -> HederaFunctionality.SCHEDULE_CREATE; case SCHEDULE_SIGN -> HederaFunctionality.SCHEDULE_SIGN; case SCHEDULE_DELETE -> HederaFunctionality.SCHEDULE_DELETE; + case STATE_SIGNATURE_TRANSACTION -> HederaFunctionality.STATE_SIGNATURE_TRANSACTION; case SYSTEM_DELETE -> HederaFunctionality.SYSTEM_DELETE; case SYSTEM_UNDELETE -> HederaFunctionality.SYSTEM_UNDELETE; + case TOKEN_AIRDROP -> HederaFunctionality.TOKEN_AIRDROP; case TOKEN_ASSOCIATE -> HederaFunctionality.TOKEN_ASSOCIATE_TO_ACCOUNT; case TOKEN_BURN -> HederaFunctionality.TOKEN_BURN; + case TOKEN_CANCEL_AIRDROP -> HederaFunctionality.TOKEN_CANCEL_AIRDROP; + case TOKEN_CLAIM_AIRDROP -> HederaFunctionality.TOKEN_CLAIM_AIRDROP; case TOKEN_CREATION -> HederaFunctionality.TOKEN_CREATE; case TOKEN_DELETION -> HederaFunctionality.TOKEN_DELETE; case TOKEN_DISSOCIATE -> HederaFunctionality.TOKEN_DISSOCIATE_FROM_ACCOUNT; @@ -217,22 +225,15 @@ public static HederaFunctionality functionOf(final TransactionBody txn) throws U case TOKEN_GRANT_KYC -> HederaFunctionality.TOKEN_GRANT_KYC_TO_ACCOUNT; case TOKEN_MINT -> HederaFunctionality.TOKEN_MINT; case TOKEN_PAUSE -> HederaFunctionality.TOKEN_PAUSE; + case TOKEN_REJECT -> HederaFunctionality.TOKEN_REJECT; case TOKEN_REVOKE_KYC -> HederaFunctionality.TOKEN_REVOKE_KYC_FROM_ACCOUNT; case TOKEN_UNFREEZE -> HederaFunctionality.TOKEN_UNFREEZE_ACCOUNT; case TOKEN_UNPAUSE -> HederaFunctionality.TOKEN_UNPAUSE; case TOKEN_UPDATE -> HederaFunctionality.TOKEN_UPDATE; case TOKEN_UPDATE_NFTS -> HederaFunctionality.TOKEN_UPDATE_NFTS; case TOKEN_WIPE -> HederaFunctionality.TOKEN_ACCOUNT_WIPE; - case UTIL_PRNG -> HederaFunctionality.UTIL_PRNG; case UNCHECKED_SUBMIT -> HederaFunctionality.UNCHECKED_SUBMIT; - case NODE_CREATE -> HederaFunctionality.NODE_CREATE; - case NODE_UPDATE -> HederaFunctionality.NODE_UPDATE; - case NODE_DELETE -> HederaFunctionality.NODE_DELETE; - case TOKEN_REJECT -> HederaFunctionality.TOKEN_REJECT; - case TOKEN_AIRDROP -> HederaFunctionality.TOKEN_AIRDROP; - case TOKEN_CANCEL_AIRDROP -> HederaFunctionality.TOKEN_CANCEL_AIRDROP; - case TOKEN_CLAIM_AIRDROP -> HederaFunctionality.TOKEN_CLAIM_AIRDROP; - case STATE_SIGNATURE_TRANSACTION -> HederaFunctionality.STATE_SIGNATURE_TRANSACTION; + case UTIL_PRNG -> HederaFunctionality.UTIL_PRNG; case UNSET -> throw new UnknownHederaFunctionality(); }; } diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java index 69ee47d9682f..695a54f6c099 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java @@ -275,7 +275,7 @@ private void checkTransactionDeprecation(@NonNull final Transaction tx) throws P // as long as the transaction ALSO has either #2 or #3 populated. This seems really odd, and ideally // we would be able to remove support for #1 entirely. To do this, we need metrics to see if anyone // is using #1 in any way. - if (tx.hasBody() || tx.hasSigs()) { + if (tx.hasSigs()) { superDeprecatedCounter.increment(); } diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java index 646cffa8d670..304db426af04 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java @@ -38,8 +38,7 @@ * of this class, so we don't have to parse it all again later.

* * @param transaction The transaction itself - * @param txBody the deserialized {@link TransactionBody} (either from the {@link Transaction#body()} or - * from the {@link Transaction#signedTransactionBytes()}). + * @param txBody the deserialized {@link TransactionBody} (from the {@link Transaction#signedTransactionBytes()}). * @param transactionID the validated {@link TransactionID} extracted from {@link #txBody} * @param payerID the validated {@link AccountID} of the payer extracted from {@link #transactionID} * @param signatureMap the {@link SignatureMap} (either from {@link Transaction#sigMap()} or diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java index 06174347dbef..61748942ce96 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java @@ -210,6 +210,7 @@ private TransactionHandler getHandler(@NonNull final TransactionBody txBody) { case TOKEN_CANCEL_AIRDROP -> handlers.tokenCancelAirdropHandler(); case UTIL_PRNG -> handlers.utilPrngHandler(); + case ATOMIC_BATCH -> handlers.atomicBatchHandler(); case SYSTEM_DELETE -> switch (txBody.systemDeleteOrThrow().id().kind()) { case CONTRACT_ID -> handlers.contractSystemDeleteHandler(); diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionHandlers.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionHandlers.java index cf926000bfc7..c8cc5922e0bd 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionHandlers.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionHandlers.java @@ -69,6 +69,7 @@ import com.hedera.node.app.service.token.impl.handlers.TokenUnpauseHandler; import com.hedera.node.app.service.token.impl.handlers.TokenUpdateHandler; import com.hedera.node.app.service.token.impl.handlers.TokenUpdateNftsHandler; +import com.hedera.node.app.service.util.impl.handlers.AtomicBatchHandler; import com.hedera.node.app.service.util.impl.handlers.UtilPrngHandler; import edu.umd.cs.findbugs.annotations.NonNull; @@ -130,4 +131,5 @@ public record TransactionHandlers( @NonNull NodeUpdateHandler nodeUpdateHandler, @NonNull NodeDeleteHandler nodeDeleteHandler, @NonNull TokenClaimAirdropHandler tokenClaimAirdropHandler, - @NonNull UtilPrngHandler utilPrngHandler) {} + @NonNull UtilPrngHandler utilPrngHandler, + @NonNull AtomicBatchHandler atomicBatchHandler) {} diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/HandleWorkflowModule.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/HandleWorkflowModule.java index 58462ec0ea76..34f97292619a 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/HandleWorkflowModule.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/HandleWorkflowModule.java @@ -164,6 +164,7 @@ static TransactionHandlers provideTransactionHandlers( addressBookHandlers.nodeUpdateHandler(), addressBookHandlers.nodeDeleteHandler(), tokenHandlers.tokenClaimAirdropHandler(), - utilHandlers.prngHandler()); + utilHandlers.prngHandler(), + utilHandlers.atomicBatchHandler()); } } diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java index 6e3c6a06ba23..f6b0711326d9 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java @@ -37,7 +37,6 @@ import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; -import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.AssessedCustomFee; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.TransactionRecord; @@ -61,9 +60,9 @@ public class BlockStreamBuilderTest { public static final int ENTROPY_NUMBER = 87372879; public static final String MEMO = "Yo Memo"; private Transaction transaction = Transaction.newBuilder() - .body(TransactionBody.newBuilder() - .cryptoTransfer(CryptoTransferTransactionBody.newBuilder().build()) - .build()) + // .body(TransactionBody.newBuilder() + // .cryptoTransfer(CryptoTransferTransactionBody.newBuilder().build()) + // .build()) .build(); private @Mock TransactionID transactionID; private final Bytes transactionBytes = Bytes.wrap("Hello Tester"); diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java index cafaa5033ec5..950637363b33 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java @@ -1610,7 +1610,8 @@ private TransactionInfo scheduleCreate( .transactionID(TransactionID.newBuilder().accountID(PAYER_ID).build()) .scheduleCreate(schedule) .build(); - final var txn = Transaction.newBuilder().body(body).build(); + final var txn = Transaction.newBuilder().build(); + // final var txn = Schedule.newBuilder().originalCreateTransaction(body).build(); return new TransactionInfo( txn, body, @@ -1628,7 +1629,7 @@ private TransactionInfo scheduleSign(ScheduleID scheduleID) { .transactionID(TransactionID.newBuilder().accountID(PAYER_ID).build()) .scheduleSign(schedule) .build(); - final var txn = Transaction.newBuilder().body(body).build(); + final var txn = Transaction.newBuilder().build(); return new TransactionInfo( txn, body, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java index 54d2ec3a1b9f..04490a04e02a 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java @@ -40,8 +40,6 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Duration; -import com.hedera.hapi.node.base.Signature; -import com.hedera.hapi.node.base.SignatureList; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.SignaturePair; import com.hedera.hapi.node.base.Timestamp; @@ -289,30 +287,6 @@ void happyDeprecatedPath() throws PreCheckException { assertThat(counterMetric("SuperDeprTxnsRcv").get()).isZero(); } - @Test - @DisplayName("A transaction with super deprecated fields alone will throw") - @SuppressWarnings("deprecation") - void parseAndCheckWithSuperDeprecatedFields() throws PreCheckException { - // Given a transaction using the super deprecated fields - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .build(); - inputBuffer = Bytes.wrap(asByteArray(localTx)); - - // When we check, then we get a PreCheckException with INVALID_TRANSACTION_BODY - final var transaction = checker.parse(inputBuffer); - assertThatThrownBy(() -> checker.check(transaction, null)) - .isInstanceOf(PreCheckException.class) - .has(responseCode(INVALID_TRANSACTION_BODY)); - - // And the super deprecation counter has been incremented - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - // But the deprecation counter has not - assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); - } - @Test @DisplayName("If the transaction bytes are not valid protobuf, it will fail") void badTransactionProtobuf() { @@ -405,79 +379,6 @@ void happyWithDeprecatedFields() throws PreCheckException { // But the super deprecation counter has not assertThat(counterMetric("SuperDeprTxnsRcv").get()).isZero(); } - - @Test - @DisplayName("A transaction with super deprecated fields alone will throw") - @SuppressWarnings("deprecation") - void happyWithSuperDeprecatedFields() { - // Given a transaction using the super deprecated fields - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .build(); - - // When we check, then we get a PreCheckException with INVALID_TRANSACTION_BODY - assertThatThrownBy(() -> checker.check(localTx, null)) - .isInstanceOf(PreCheckException.class) - .has(responseCode(INVALID_TRANSACTION_BODY)); - - // And the super deprecation counter has been incremented - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - // But the deprecation counter has not - assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); - } - - @Test - @DisplayName( - "A transaction with super deprecated fields and signedTransactionBytes ignores super deprecated fields") - @SuppressWarnings("deprecation") - void checkWithSuperDeprecatedFieldsAndSignedTransactionBytes() throws PreCheckException { - // Given a transaction using the super deprecated fields and signedTransactionBytes - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .signedTransactionBytes(asBytes(SignedTransaction.PROTOBUF, signedTx)) - .build(); - - // When we check - final var info = checker.check(localTx, null); - // Then the parsed data is as we expected - assertThat(info.transaction()).isEqualTo(localTx); - assertThat(info.txBody()).isEqualTo(txBody); - assertThat(info.signatureMap()).isEqualTo(signatureMap); - assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); - // And the super-deprecated counter is incremented, but not the deprecated counter - assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - } - - @Test - @DisplayName( - "A transaction with super deprecated fields and deprecated fields ignores super deprecated fields") - @SuppressWarnings("deprecation") - void checkWithSuperDeprecatedFieldsAndDeprecatedFields() throws PreCheckException { - // Given a transaction using the super deprecated fields and signedTransactionBytes - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .bodyBytes(asBytes(TransactionBody.PROTOBUF, txBody)) - .sigMap(signatureMap) - .build(); - - // When we check - final var info = checker.check(localTx, null); - // Then the parsed data is as we expected - assertThat(info.transaction()).isEqualTo(localTx); - assertThat(info.txBody()).isEqualTo(txBody); - assertThat(info.signatureMap()).isEqualTo(signatureMap); - assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); - // And the super-deprecated counter is incremented, and also the deprecated counter - assertThat(counterMetric("DeprTxnsRcv").get()).isEqualTo(1); - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - } } @Nested diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java index e0e1eb73f22e..1e65d00033c4 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java @@ -114,7 +114,6 @@ public TransactionInfo txInfo() { final var signedTx = SignedTransaction.newBuilder().bodyBytes(signedbytes).build(); final var tx = Transaction.newBuilder() - .body(body) .signedTransactionBytes(asBytes(SignedTransaction.PROTOBUF, signedTx)) .build(); return new TransactionInfo(tx, body, SignatureMap.DEFAULT, signedbytes, function, null); diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java index 0e1bb82cbf39..f96a1980a769 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java @@ -274,12 +274,7 @@ public class DispatchHandleContextTest extends StateTestBase implements Scenario .consensusSubmitMessage(ConsensusSubmitMessageTransactionBody.DEFAULT) .build(); private static final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().body(txBody).build(), - txBody, - SignatureMap.DEFAULT, - Bytes.EMPTY, - CRYPTO_TRANSFER, - null); + Transaction.newBuilder().build(), txBody, SignatureMap.DEFAULT, Bytes.EMPTY, CRYPTO_TRANSFER, null); private static final TransactionBody MISSING_PAYER_ID = TransactionBody.newBuilder().transactionID(TransactionID.DEFAULT).build(); @@ -752,12 +747,7 @@ private DispatchHandleContext createContext( } final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().body(txBody).build(), - txBody, - SignatureMap.DEFAULT, - Bytes.EMPTY, - function, - null); + Transaction.newBuilder().build(), txBody, SignatureMap.DEFAULT, Bytes.EMPTY, function, null); return new DispatchHandleContext( CONSENSUS_NOW, creatorInfo, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java index 3f0339dbbb02..2becd6ec3108 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java @@ -96,7 +96,7 @@ public class RecordFinalizerTest { .build(); private static final TransactionBody TX_BODY = asTxn(TRANSFER_BODY, PAYER_ID, CONSENSUS_NOW); private static final TransactionInfo TXN_INFO = new TransactionInfo( - Transaction.newBuilder().body(TX_BODY).build(), + Transaction.newBuilder().build(), TX_BODY, SignatureMap.DEFAULT, Bytes.EMPTY, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java index b397f831477c..5d6eccea3b42 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java @@ -221,7 +221,7 @@ void completeHollowAccountsWithEthereumTransaction() { .ethereumTransaction(EthereumTransactionBody.DEFAULT) .build(); final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().body(txnBody).build(), + Transaction.newBuilder().build(), txnBody, SignatureMap.DEFAULT, transactionBytes, @@ -253,7 +253,7 @@ void ignoreEthereumTransactionIfNoCorrespondingSigs() { .ethereumTransaction(EthereumTransactionBody.DEFAULT) .build(); final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().body(txnBody).build(), + Transaction.newBuilder().build(), txnBody, SignatureMap.DEFAULT, transactionBytes, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java index 768be96298c3..c584c1c95699 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java @@ -126,13 +126,11 @@ void setUp() { @Test void testMethodsWithInvalidArguments() { // given - final var txBody = simpleCryptoTransfer().body(); + final var txBody = TransactionBody.DEFAULT; // then assertThatThrownBy(() -> subject.handleTxBody(null, txBody, DEFAULT_CONFIG)) .isInstanceOf(NullPointerException.class); - assertThatThrownBy(() -> subject.handleTxBody(state, txBody, DEFAULT_CONFIG)) - .isInstanceOf(NullPointerException.class); assertThatThrownBy(() -> subject.handleTxBody(state, null, DEFAULT_CONFIG)) .isInstanceOf(NullPointerException.class); } diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java index 7d41cc548d44..486a77fac015 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java @@ -104,7 +104,7 @@ void setUp() { @Test void testMethodsWithInvalidArguments() { // given - final var txBody = simpleCryptoTransfer().body(); + final var txBody = TransactionBody.DEFAULT; // then assertThatThrownBy(() -> new SystemFileUpdates(null, exchangeRateManager, feeManager, throttleServiceManager)) @@ -119,7 +119,6 @@ void testMethodsWithInvalidArguments() { assertThatThrownBy(() -> subject.handleTxBody(null, txBody)).isInstanceOf(NullPointerException.class); assertThatThrownBy(() -> subject.handleTxBody(state, null)).isInstanceOf(NullPointerException.class); - assertThatThrownBy(() -> subject.handleTxBody(state, txBody)).isInstanceOf(NullPointerException.class); } @Test diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java index 60e32c980460..8406f58da119 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java @@ -134,7 +134,7 @@ void setup() throws PreCheckException { // TODO Mock out the metrics to return objects we can inspect later // Mock out the onset to always return a valid parsed object - transaction = Transaction.newBuilder().body(transactionBody).build(); + transaction = Transaction.newBuilder().build(); when(transactionChecker.parse(requestBuffer)).thenReturn(transaction); final var transactionInfo = new TransactionInfo( transaction, diff --git a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/ApiPermissionConfig.java b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/ApiPermissionConfig.java index 7dab1706417e..bc2ed9932e1d 100644 --- a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/ApiPermissionConfig.java +++ b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/ApiPermissionConfig.java @@ -16,6 +16,7 @@ package com.hedera.node.config.data; +import static com.hedera.hapi.node.base.HederaFunctionality.ATOMIC_BATCH; import static com.hedera.hapi.node.base.HederaFunctionality.CONSENSUS_CREATE_TOPIC; import static com.hedera.hapi.node.base.HederaFunctionality.CONSENSUS_DELETE_TOPIC; import static com.hedera.hapi.node.base.HederaFunctionality.CONSENSUS_GET_TOPIC_INFO; @@ -119,6 +120,7 @@ * @param deleteAllowances the permission for {@link HederaFunctionality#CRYPTO_DELETE_ALLOWANCE} * functionality * @param utilPrng the permission for {@link HederaFunctionality#UTIL_PRNG} functionality + * @param atomicBatch the permission for {@link HederaFunctionality#ATOMIC_BATCH} functionality * @param createFile the permission for {@link HederaFunctionality#FILE_CREATE} functionality * @param updateFile the permission for {@link HederaFunctionality#FILE_UPDATE} functionality * @param deleteFile the permission for {@link HederaFunctionality#FILE_DELETE} functionality @@ -204,6 +206,7 @@ public record ApiPermissionConfig( @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange approveAllowances, @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange deleteAllowances, @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange utilPrng, + @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange atomicBatch, @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange createFile, @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange updateFile, @ConfigProperty(defaultValue = "0-*") PermissionedAccountsRange deleteFile, @@ -340,6 +343,7 @@ public record ApiPermissionConfig( permissionKeys.put(TOKEN_GET_ACCOUNT_NFT_INFOS, c -> c.tokenGetAccountNftInfos); permissionKeys.put(TOKEN_FEE_SCHEDULE_UPDATE, c -> c.tokenFeeScheduleUpdate); permissionKeys.put(UTIL_PRNG, c -> c.utilPrng); + permissionKeys.put(ATOMIC_BATCH, c -> c.atomicBatch); permissionKeys.put(NODE_CREATE, c -> c.createNode); permissionKeys.put(NODE_UPDATE, c -> c.updateNode); permissionKeys.put(NODE_DELETE, c -> c.deleteNode); diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java index fdc401c52916..62f266572848 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java @@ -293,7 +293,7 @@ private TransactionBody givenMintTxn(final TokenID tokenId, final List me .tokenMint(builder.build()) .build(); - final var txn = Transaction.newBuilder().body(txnBody).build(); + final var txn = Transaction.DEFAULT; recordBuilder.transaction(txn); given(handleContext.body()).willReturn(txnBody); diff --git a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java new file mode 100644 index 000000000000..2395c96e6615 --- /dev/null +++ b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.hedera.node.app.service.util.impl.handlers; + +import static java.util.Objects.requireNonNull; + +import com.hedera.hapi.node.base.HederaFunctionality; +import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.node.app.spi.workflows.HandleContext; +import com.hedera.node.app.spi.workflows.HandleException; +import com.hedera.node.app.spi.workflows.PreCheckException; +import com.hedera.node.app.spi.workflows.PreHandleContext; +import com.hedera.node.app.spi.workflows.TransactionHandler; +import edu.umd.cs.findbugs.annotations.NonNull; +import javax.inject.Inject; +import javax.inject.Singleton; + +/** + * This class contains all workflow-related functionality regarding {@link HederaFunctionality#ATOMIC_BATCH}. + */ +@Singleton +public class AtomicBatchHandler implements TransactionHandler { + /** + * Constructs a {@link AtomicBatchHandler} + */ + @Inject + public AtomicBatchHandler() { + // exists for Dagger injection + } + + /** + * Performs checks independent of state or context. + * + * @param txn the transaction to check + */ + @Override + public void pureChecks(@NonNull final TransactionBody txn) throws PreCheckException { + // TODO + } + + /** + * This method is called during the pre-handle workflow. + * + * @param context the {@link PreHandleContext} which collects all information + * @throws PreCheckException if any issue happens on the pre handle level + */ + @Override + public void preHandle(@NonNull final PreHandleContext context) throws PreCheckException { + requireNonNull(context); + // TODO + } + + @Override + public void handle(@NonNull final HandleContext handleContext) throws HandleException { + requireNonNull(handleContext); + // TODO + } +} diff --git a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilHandlers.java b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilHandlers.java index cb0c308aa424..78f319f655cf 100644 --- a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilHandlers.java +++ b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilHandlers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,13 +25,20 @@ public class UtilHandlers { private final UtilPrngHandler prngHandler; + private final AtomicBatchHandler atomicBatchHandler; @Inject - public UtilHandlers(@NonNull final UtilPrngHandler prngHandler) { + public UtilHandlers( + @NonNull final UtilPrngHandler prngHandler, @NonNull final AtomicBatchHandler atomicBatchHandler) { this.prngHandler = Objects.requireNonNull(prngHandler, "prngHandler must not be null"); + this.atomicBatchHandler = Objects.requireNonNull(atomicBatchHandler, "atomicBatchHandler must not be null"); } public UtilPrngHandler prngHandler() { return prngHandler; } + + public AtomicBatchHandler atomicBatchHandler() { + return atomicBatchHandler; + } } diff --git a/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilHandlersTest.java b/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilHandlersTest.java index 6fd72b7614ee..3d97862bbb6c 100644 --- a/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilHandlersTest.java +++ b/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilHandlersTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; +import com.hedera.node.app.service.util.impl.handlers.AtomicBatchHandler; import com.hedera.node.app.service.util.impl.handlers.UtilHandlers; import com.hedera.node.app.service.util.impl.handlers.UtilPrngHandler; import org.junit.jupiter.api.BeforeEach; @@ -26,17 +27,23 @@ class UtilHandlersTest { private UtilPrngHandler prngHandler; + private AtomicBatchHandler atomicBatchHandler; private UtilHandlers utilHandlers; @BeforeEach public void setUp() { prngHandler = mock(UtilPrngHandler.class); - utilHandlers = new UtilHandlers(prngHandler); + atomicBatchHandler = mock(AtomicBatchHandler.class); + utilHandlers = new UtilHandlers(prngHandler, atomicBatchHandler); } @Test void prngHandlerReturnsCorrectInstance() { assertEquals(prngHandler, utilHandlers.prngHandler(), "prngHandler does not return correct instance"); + assertEquals( + atomicBatchHandler, + utilHandlers.atomicBatchHandler(), + "atomicBatchHandler does not return correct instance"); } } diff --git a/hedera-node/hedera-util-service/src/main/java/com/hedera/node/app/service/util/UtilServiceDefinition.java b/hedera-node/hedera-util-service/src/main/java/com/hedera/node/app/service/util/UtilServiceDefinition.java index 23ccc3e6b668..0f6f40c354e3 100644 --- a/hedera-node/hedera-util-service/src/main/java/com/hedera/node/app/service/util/UtilServiceDefinition.java +++ b/hedera-node/hedera-util-service/src/main/java/com/hedera/node/app/service/util/UtilServiceDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,8 +30,9 @@ public final class UtilServiceDefinition implements RpcServiceDefinition { public static final UtilServiceDefinition INSTANCE = new UtilServiceDefinition(); - private static final Set> methods = - Set.of(new RpcMethodDefinition<>("prng", Transaction.class, TransactionResponse.class)); + private static final Set> methods = Set.of( + new RpcMethodDefinition<>("prng", Transaction.class, TransactionResponse.class), + new RpcMethodDefinition<>("atomicBatch", Transaction.class, TransactionResponse.class)); private UtilServiceDefinition() { // Forbid instantiation diff --git a/hedera-node/hedera-util-service/src/test/java/com/hedera/node/app/service/util/UtilServiceDefinitionTest.java b/hedera-node/hedera-util-service/src/test/java/com/hedera/node/app/service/util/UtilServiceDefinitionTest.java index cdd726767579..858bce990c7c 100644 --- a/hedera-node/hedera-util-service/src/test/java/com/hedera/node/app/service/util/UtilServiceDefinitionTest.java +++ b/hedera-node/hedera-util-service/src/test/java/com/hedera/node/app/service/util/UtilServiceDefinitionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,6 +34,7 @@ void methodsDefined() { final var methods = UtilServiceDefinition.INSTANCE.methods(); Assertions.assertThat(methods) .containsExactlyInAnyOrder( - new RpcMethodDefinition<>("prng", Transaction.class, TransactionResponse.class)); + new RpcMethodDefinition<>("prng", Transaction.class, TransactionResponse.class), + new RpcMethodDefinition<>("atomicBatch", Transaction.class, TransactionResponse.class)); } } From 445eecc441d6d61f7c447d95022dbfec2e0008d4 Mon Sep 17 00:00:00 2001 From: Lev Povolotsky Date: Mon, 13 Jan 2025 15:50:33 -0500 Subject: [PATCH 11/21] add feature flag Signed-off-by: Lev Povolotsky --- .../app/config/ServicesConfigExtension.java | 2 ++ .../node/config/data/AtomicBatchConfig.java | 24 +++++++++++++++++++ .../impl/handlers/AtomicBatchHandler.java | 5 ++++ 3 files changed, 31 insertions(+) create mode 100644 hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java index fb348a255366..3ceffc680514 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java @@ -38,6 +38,7 @@ import com.hedera.node.config.converter.SemanticVersionConverter; import com.hedera.node.config.data.AccountsConfig; import com.hedera.node.config.data.ApiPermissionConfig; +import com.hedera.node.config.data.AtomicBatchConfig; import com.hedera.node.config.data.AutoCreationConfig; import com.hedera.node.config.data.AutoRenew2Config; import com.hedera.node.config.data.AutoRenewConfig; @@ -127,6 +128,7 @@ public Set> getConfigDataTypes() { TopicsConfig.class, TraceabilityConfig.class, UtilPrngConfig.class, + AtomicBatchConfig.class, VersionConfig.class, TssConfig.class); } diff --git a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java new file mode 100644 index 000000000000..0279300e8fca --- /dev/null +++ b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.hedera.node.config.data; + +import com.hedera.node.config.NetworkProperty; +import com.swirlds.config.api.ConfigData; +import com.swirlds.config.api.ConfigProperty; + +@ConfigData("utilPrng") +public record AtomicBatchConfig(@ConfigProperty(defaultValue = "true") @NetworkProperty boolean isEnabled) {} diff --git a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java index 2395c96e6615..ed4596b47e34 100644 --- a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java +++ b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java @@ -25,6 +25,8 @@ import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.PreHandleContext; import com.hedera.node.app.spi.workflows.TransactionHandler; +import com.hedera.node.config.data.AtomicBatchConfig; +import com.hedera.node.config.data.UtilPrngConfig; import edu.umd.cs.findbugs.annotations.NonNull; import javax.inject.Inject; import javax.inject.Singleton; @@ -68,5 +70,8 @@ public void preHandle(@NonNull final PreHandleContext context) throws PreCheckEx public void handle(@NonNull final HandleContext handleContext) throws HandleException { requireNonNull(handleContext); // TODO + if (!handleContext.configuration().getConfigData(AtomicBatchConfig.class).isEnabled()) { + return; + } } } From 134cff5eb60250f70a830c95e84620d32212d180 Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Mon, 13 Jan 2025 13:58:06 -0800 Subject: [PATCH 12/21] Spotless Signed-off-by: Kim Rader --- .../com/hedera/node/app/config/ServicesConfigExtension.java | 2 +- .../java/com/hedera/node/config/data/AtomicBatchConfig.java | 2 +- .../app/service/util/impl/handlers/AtomicBatchHandler.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java index 3ceffc680514..5c0c84d2dcb5 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/config/ServicesConfigExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java index 0279300e8fca..5e89e5a851e0 100644 --- a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java +++ b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java index ed4596b47e34..050316351fcf 100644 --- a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java +++ b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java @@ -26,7 +26,6 @@ import com.hedera.node.app.spi.workflows.PreHandleContext; import com.hedera.node.app.spi.workflows.TransactionHandler; import com.hedera.node.config.data.AtomicBatchConfig; -import com.hedera.node.config.data.UtilPrngConfig; import edu.umd.cs.findbugs.annotations.NonNull; import javax.inject.Inject; import javax.inject.Singleton; @@ -70,7 +69,10 @@ public void preHandle(@NonNull final PreHandleContext context) throws PreCheckEx public void handle(@NonNull final HandleContext handleContext) throws HandleException { requireNonNull(handleContext); // TODO - if (!handleContext.configuration().getConfigData(AtomicBatchConfig.class).isEnabled()) { + if (!handleContext + .configuration() + .getConfigData(AtomicBatchConfig.class) + .isEnabled()) { return; } } From 98aa4f6446336a7b21eae6a6d20e6e49e9134e9e Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Tue, 14 Jan 2025 10:50:41 -0800 Subject: [PATCH 13/21] Fix feature flag config Signed-off-by: Kim Rader --- .../java/com/hedera/node/config/data/AtomicBatchConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java index 5e89e5a851e0..087c9afcda11 100644 --- a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java +++ b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/AtomicBatchConfig.java @@ -20,5 +20,5 @@ import com.swirlds.config.api.ConfigData; import com.swirlds.config.api.ConfigProperty; -@ConfigData("utilPrng") +@ConfigData("atomicBatch") public record AtomicBatchConfig(@ConfigProperty(defaultValue = "true") @NetworkProperty boolean isEnabled) {} From 49371d62cc74b2103b7a216267bee110444d13ce Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Tue, 14 Jan 2025 14:25:58 -0800 Subject: [PATCH 14/21] Fix merge issue Signed-off-by: Kim Rader --- .../services/atomic_batch.proto | 44 -- .../services/transaction.proto | 16 +- .../services/transaction_body.proto | 574 ------------------ .../impl/handlers/AtomicBatchHandler.java | 2 +- 4 files changed, 16 insertions(+), 620 deletions(-) delete mode 100644 hapi/hedera-protobufs/services/atomic_batch.proto delete mode 100644 hapi/hedera-protobufs/services/transaction_body.proto diff --git a/hapi/hedera-protobufs/services/atomic_batch.proto b/hapi/hedera-protobufs/services/atomic_batch.proto deleted file mode 100644 index 74eed67eeacc..000000000000 --- a/hapi/hedera-protobufs/services/atomic_batch.proto +++ /dev/null @@ -1,44 +0,0 @@ -/** - * # Atomic Batch - * A transaction that groups multiple transactions together, and executes - * them atomically. - * - * ### 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; - -/* - * Copyright (C) 2018-2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -option java_package = "com.hederahashgraph.api.proto.java"; -// <<>> This comment is special code for setting PBJ Compiler java package -option java_multiple_files = true; - -import "transaction.proto"; - -/** - * Create an atomic batch. - */ -message AtomicBatchTransactionBody { - repeated Transaction transactions = 1; -} diff --git a/hapi/hedera-protobufs/services/transaction.proto b/hapi/hedera-protobufs/services/transaction.proto index 88c5b43d04d8..93c5e2be7f07 100644 --- a/hapi/hedera-protobufs/services/transaction.proto +++ b/hapi/hedera-protobufs/services/transaction.proto @@ -239,7 +239,12 @@ message TransactionBody { * (default 100) bytes when encoded as UTF-8. */ string memo = 6; - + /** +* The entire public key of the trusted batch assembler. +* +* Only Ed25519 and ECDSA(secp256k1) keys and hence signatures are currently supported. +*/ + Key batchKey = 66; // The fields here are ordered in strictly ascending field ordinal // order due to limitations in PBJ. oneof data { @@ -606,5 +611,14 @@ message TransactionBody { * A transaction body for signature of a state root hash gossiped to other nodes */ com.hedera.hapi.platform.event.StateSignatureTransaction state_signature_transaction = 65; + + AtomicBatchTransactionBody atomicBatch = 67; } } + +/** + * Create an atomic batch. + */ +message AtomicBatchTransactionBody { + repeated Transaction transactions = 1; +} diff --git a/hapi/hedera-protobufs/services/transaction_body.proto b/hapi/hedera-protobufs/services/transaction_body.proto deleted file mode 100644 index c399c9f21b87..000000000000 --- a/hapi/hedera-protobufs/services/transaction_body.proto +++ /dev/null @@ -1,574 +0,0 @@ -/** - * # Transaction Body - * The body of a transaction, this message is serialized and signed. - * - * All of the entries in the `data` `oneof` are fully specified elsewhere; - * we only include a short summary here. - * - * ### 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; - -/* - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -option java_package = "com.hederahashgraph.api.proto.java"; -// <<>> This comment is special code for setting PBJ Compiler java package -option java_multiple_files = true; - -import "system_delete.proto"; -import "system_undelete.proto"; -import "freeze.proto"; - -import "contract_call.proto"; -import "contract_create.proto"; -import "contract_update.proto"; - -import "crypto_add_live_hash.proto"; -import "crypto_create.proto"; -import "crypto_delete.proto"; -import "crypto_delete_live_hash.proto"; -import "crypto_transfer.proto"; -import "crypto_update.proto"; -import "crypto_approve_allowance.proto"; -import "crypto_delete_allowance.proto"; - -import "ethereum_transaction.proto"; - -import "file_append.proto"; -import "file_create.proto"; -import "file_delete.proto"; -import "file_update.proto"; - -import "duration.proto"; -import "basic_types.proto"; -import "contract_delete.proto"; - -import "consensus_create_topic.proto"; -import "consensus_update_topic.proto"; -import "consensus_delete_topic.proto"; -import "consensus_submit_message.proto"; - -import "unchecked_submit.proto"; - -import "token_create.proto"; -import "token_freeze_account.proto"; -import "token_unfreeze_account.proto"; -import "token_grant_kyc.proto"; -import "token_revoke_kyc.proto"; -import "token_delete.proto"; -import "token_update.proto"; -import "token_mint.proto"; -import "token_burn.proto"; -import "token_wipe_account.proto"; -import "token_associate.proto"; -import "token_dissociate.proto"; -import "token_fee_schedule_update.proto"; -import "token_pause.proto"; -import "token_unpause.proto"; -import "token_update_nfts.proto"; -import "token_reject.proto"; -import "token_airdrop.proto"; -import "token_cancel_airdrop.proto"; -import "token_claim_airdrop.proto"; - -import "schedule_create.proto"; -import "schedule_delete.proto"; -import "schedule_sign.proto"; - -import "node_stake_update.proto"; -import "util_prng.proto"; -import "atomic_batch.proto"; - -import "node_create.proto"; -import "node_update.proto"; -import "node_delete.proto"; - -import "event/state_signature_transaction.proto"; - -/** - * A transaction body. - * - * Every transaction is structured as a signed byte array. That byte array - * is a serialized `TransactionBody`. The transaction body contains the full - * content of the transaction, while the `SignedTransaction` includes a - * signature map for signatures authenticating that byte array, and that is - * serialized and transmitted wrapped in a `Transaction` message.
- * The bulk of this message is a `oneof` block which offers the option for - * any one of the transaction messages for the network. - * This message also includes several additional fields to specify - * various parameters required to process a transaction. - */ -message TransactionBody { - reserved 30, 61, 62, 63, 64; - - reserved "tssMessage", "tssVote", "tssShareSignature", "tssEncryptionKey"; - - /** - * A transaction identifier.
- * Each transaction is uniquely identified by its transaction - * identifier. - *

- * Each transaction identifier MUST be unique.
- * Multiple transactions MAY be submitted with the same transaction - * identifier, but all except the first SHALL be rejected as duplicate - * transactions.
- * This identifier MUST specify a `payer` account to be charged - * all fees associated with the transaction.
- * This identifier MUST specify a "valid start time".
- * The "valid start time" MUST be strictly _earlier_ than the current - * network consensus time.
- * The "valid start time" MUST NOT be more than the current network - * configuration value for `transaction.maxValidDuration` seconds - * before the current network consensus time.
- * This identifier MUST NOT set the `scheduled` flag.
- * This identifier MUST NOT set a nonce value. - */ - TransactionID transactionID = 1; - - /** - * A node account identifier. - *

- * This MUST identify the account of the consensus node to which - * this transaction is submitted. - */ - AccountID nodeAccountID = 2; - - /** - * A maximum transaction fee, in tinybar. - *

- * The network SHALL NOT charge a transaction fee that exceeds this - * amount.
- * The network MAY charge up to this amount, and reject the transaction, - * if the amount offered is insufficient to cover the required fees.
- * The network MAY charge a minimum fee equal to 80% of the amount offered - * if the amount offered is much larger than the required fees. - */ - uint64 transactionFee = 3; - - /** - * A maximum duration in which to execute this transaction. - *

- * This transaction SHALL be rejected as expired if the valid start time, - * extended by this duration, is less than the current network consensus - * time when the transaction is submitted.
- * This transaction SHALL be rejected with an invalid duration if this - * value is greater than the current network configuration value for - * `transaction.maxValidDuration`. - */ - Duration transactionValidDuration = 4; - - /** - * Records are always generated.
- * Obsolete option to not generate a record. - *

- * This flag SHALL be ignored. Every transaction SHALL generate a record, - * or block stream equivalent. - */ - bool generateRecord = 5 [deprecated = true]; - - /** - * A short description for this transaction. - *

- * This value, if set, MUST NOT exceed `transaction.maxMemoUtf8Bytes` - * (default 100) bytes when encoded as UTF-8. - */ - string memo = 6; - - /** -* The entire public key of the trusted batch assembler. -* -* Only Ed25519 and ECDSA(secp256k1) keys and hence signatures are currently supported. -*/ - Key batchKey = 66; - - // The fields here are ordered in strictly ascending field ordinal - // order due to limitations in PBJ. - oneof data { - /** - * Call a function defined on a smart contract. - */ - ContractCallTransactionBody contractCall = 7; - - /** - * Create a smart contract. - */ - ContractCreateTransactionBody contractCreateInstance = 8; - - /** - * Update a smart contract. - */ - ContractUpdateTransactionBody contractUpdateInstance = 9; - - /** - * An obsolete, and unsupported, operation to add a "live hash" to - * an account. - */ - CryptoAddLiveHashTransactionBody cryptoAddLiveHash = 10 [deprecated = true]; - - /** - * Create a new Hedera account. - */ - CryptoCreateTransactionBody cryptoCreateAccount = 11; - - /** - * Delete an Hedera account.
- * This will mark the account as deleted, and transfer all remaining - * HBAR to a receiver account. - */ - CryptoDeleteTransactionBody cryptoDelete = 12; - - /** - * An obsolete, and unsupported, operation to remove a "live hash" from - * an account. - */ - CryptoDeleteLiveHashTransactionBody cryptoDeleteLiveHash = 13 [deprecated = true]; - - /** - * Transfer HBAR between accounts. - */ - CryptoTransferTransactionBody cryptoTransfer = 14; - - /** - * Modify an Hedera account. - */ - CryptoUpdateTransactionBody cryptoUpdateAccount = 15; - - /** - * Append data to the end of a file. - */ - FileAppendTransactionBody fileAppend = 16; - - /** - * Create a new file. - */ - FileCreateTransactionBody fileCreate = 17; - - /** - * Delete a file.
- * This will remove the content of the file, and mark the file as - * deleted. - */ - FileDeleteTransactionBody fileDelete = 18; - - /** - * Modify a file.
- * This may modify any metadata, and/or _replace_ the content. - */ - FileUpdateTransactionBody fileUpdate = 19; - - /** - * Delete a file as an Hedera administrative function.
- * This is a privileged operation. - */ - SystemDeleteTransactionBody systemDelete = 20; - - /** - * Restore a file deleted via `systemDelete`.
- * This is a privileged operation. - */ - SystemUndeleteTransactionBody systemUndelete = 21; - - /** - * Delete a smart contract and transfer remaining balance - * to a specified account. - */ - ContractDeleteTransactionBody contractDeleteInstance = 22; - - /** - * Freeze the network.
- * This is actually several possible operations, and the caller - * should examine the "freeze service" for more detail.
- * This is a privileged operation. - */ - FreezeTransactionBody freeze = 23; - - /** - * Create a topic. - */ - ConsensusCreateTopicTransactionBody consensusCreateTopic = 24; - - /** - * Update a topic. - */ - ConsensusUpdateTopicTransactionBody consensusUpdateTopic = 25; - - /** - * Delete a topic. - */ - ConsensusDeleteTopicTransactionBody consensusDeleteTopic = 26; - - /** - * Submit a message to a topic.
- * A message may be "chunked", and submitted in parts, if the total - * message size exceeds the limit for a single transaction. - */ - ConsensusSubmitMessageTransactionBody consensusSubmitMessage = 27; - - /** - * Unsupported system transaction. - *

- * This transaction MAY be implemented in testing networks, but - * SHALL NOT be enabled or supported in production environments.
- * Clients MUST NOT call this method, and any such transaction SHALL - * be rejected.
- * A network MAY choose to charge punitive fees for attempting to - * execute an `uncheckedSubmit`. - */ - UncheckedSubmitBody uncheckedSubmit = 28; - - /** - * Create a new Hedera token. - */ - TokenCreateTransactionBody tokenCreation = 29; - - /** - * Freeze an account with respect to a token.
- * A frozen account cannot transact in that token until unfrozen. - */ - TokenFreezeAccountTransactionBody tokenFreeze = 31; - - /** - * Unfreeze an account with respect to a token. - */ - TokenUnfreezeAccountTransactionBody tokenUnfreeze = 32; - - /** - * Grant KYC to an account with respect to a token.
- * KYC is generally a "know your customer" assertion that a - * responsible entity has sufficient information to positively - * identify the account holder to relevant authorities. - */ - TokenGrantKycTransactionBody tokenGrantKyc = 33; - - /** - * Revoke KYC from an account with respect to a token. - */ - TokenRevokeKycTransactionBody tokenRevokeKyc = 34; - - /** - * Delete an Hedera token.
- * The token will be marked deleted. - */ - TokenDeleteTransactionBody tokenDeletion = 35; - - /** - * Update an Hedera token.
- * Depending on what fields are to be modified, the signature - * requirements will vary. See `TokenUpdateTransactionBody` for - * further detail. - */ - TokenUpdateTransactionBody tokenUpdate = 36; - - /** - * Mint new tokens.
- * All minted tokens will be delivered to the treasury account for - * the token type. The "mint key" for the token must sign this - * transaction. - */ - TokenMintTransactionBody tokenMint = 37; - - /** - * Burn tokens from the treasury account.
- * The "burn key" for the token must sign this transaction. - */ - TokenBurnTransactionBody tokenBurn = 38; - - /** - * Wipe tokens from an account.
- * This will remove a specified amount of fungible/common tokens or - * a specified list of non-fungible/unique serial numbered tokens - * of a given token type from an Hedera account. The removed tokens - * are _burned_ as if by a `tokenBurn` transaction.
- * The "wipe key" for the token must sign this transaction. - */ - TokenWipeAccountTransactionBody tokenWipe = 39; - - /** - * Associate tokens to an account. - */ - TokenAssociateTransactionBody tokenAssociate = 40; - - /** - * Dissociate tokens from an account. - */ - TokenDissociateTransactionBody tokenDissociate = 41; - - /** - * Create a schedule.
- * A schedule is a request to execute a specific transaction, included - * in the create body, in the future. The scheduled transaction may - * execute as soon as all signature requirements are met with the - * schedule create or a subsequent schedule sign transaction. - * A schedule may, alternatively, execute on expiration if - * long-term schedules are enabled and the schedule meets signature - * requirements at that time. - */ - ScheduleCreateTransactionBody scheduleCreate = 42; - - /** - * Delete a schedule.
- * The schedule will be marked as deleted. - */ - ScheduleDeleteTransactionBody scheduleDelete = 43; - - /** - * Sign a schedule.
- * Add one or more cryptographic keys to the list of keys that have - * signed a schedule, and which may serve to meet the signature - * requirements for the scheduled transaction. - */ - ScheduleSignTransactionBody scheduleSign = 44; - - /** - * Update the custom fee schedule for a token.
- * This transaction must be signed by the "fee schedule key" - * for the token. - */ - TokenFeeScheduleUpdateTransactionBody token_fee_schedule_update = 45; - - /** - * Pause a Token. - *

- * This transaction MUST be signed by the "pause key" for the token. - */ - TokenPauseTransactionBody token_pause = 46; - - /** - * Unpause a Token. - *

- * This transaction MUST be signed by the "pause key" for the token. - */ - TokenUnpauseTransactionBody token_unpause = 47; - - /** - * Add one or more approved allowances for spenders to transfer the - * paying account's hbar or tokens. - */ - CryptoApproveAllowanceTransactionBody cryptoApproveAllowance = 48; - - /** - * Delete one or more approvals for spenders to transfer the - * paying account's hbar or tokens. - */ - CryptoDeleteAllowanceTransactionBody cryptoDeleteAllowance = 49; - - /** - * Perform an Ethereum encoded transaction. - */ - EthereumTransactionBody ethereumTransaction = 50; - - /** - * Update the staking information.
- * This internal transaction is performed at the end of a staking - * period to complete staking calculations and indicate that new - * staking period has started. - */ - NodeStakeUpdateTransactionBody node_stake_update = 51; - - /** - * Provide a deterministic pseudorandom number based on network state. - */ - UtilPrngTransactionBody util_prng = 52; - - /** - * Update one or more non-fungible/unique tokens.
- * This will update metadata for one or more serial numbers within - * a collection (token type). - */ - TokenUpdateNftsTransactionBody token_update_nfts = 53; - - /** - * Create a new node in the network address book.
- * This is a privileged operation. - *

- * This transaction SHALL create a new consensus node record and add - * that record to the network address book. - */ - com.hedera.hapi.node.addressbook.NodeCreateTransactionBody nodeCreate = 54; - - /** - * Update a node in the network address book.
- * This is a privileged operation. - *

- * This transaction SHALL update an existing consensus node record in - * the network address book. - */ - com.hedera.hapi.node.addressbook.NodeUpdateTransactionBody nodeUpdate = 55; - - /** - * Delete a node from the network address book.
- * This is a privileged operation. - *

- * This transaction SHALL mark an existing consensus node record as - * deleted and remove that node from the network address book. - */ - com.hedera.hapi.node.addressbook.NodeDeleteTransactionBody nodeDelete = 56; - - /** - * Reject and return a token to treasury.
- * This transaction will transfer one or more tokens or token - * balances held by the requesting account to the treasury - * for each token type. - *

- * Each transfer MUST be one of the following: - *

    - *
  • A single non-fungible/unique token.
    • - *
  • The full balance held for a fungible/common - * token type.
    • - *
- * When complete, the requesting account SHALL NOT hold the - * rejected tokens.
- * Custom fees and royalties defined for the tokens rejected - * SHALL NOT be charged for this transaction. - */ - TokenRejectTransactionBody tokenReject = 57; - - /** - * "Airdrop" tokens.
- * This transaction sends tokens from one or more "sender" accounts - * to one or more "recipient" accounts. - *

- * If a recipient account cannot immediately receive the token(s) sent, - * a "pending" airdrop SHALL be created and MUST be claimed. - */ - TokenAirdropTransactionBody tokenAirdrop = 58; - - /** - * Cancel one or more "pending" airdrops that are not yet claimed. - */ - TokenCancelAirdropTransactionBody tokenCancelAirdrop = 59; - - /** - * Claim one or more "pending" airdrops. - */ - TokenClaimAirdropTransactionBody tokenClaimAirdrop = 60; - - /** - * A transaction body for signature of a state root hash gossiped to other nodes - */ - com.hedera.hapi.platform.event.StateSignatureTransaction state_signature_transaction = 65; - - AtomicBatchTransactionBody atomicBatch = 67; - } -} diff --git a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java index 050316351fcf..224355d1efbf 100644 --- a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java +++ b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java @@ -19,7 +19,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.node.app.spi.workflows.HandleContext; import com.hedera.node.app.spi.workflows.HandleException; import com.hedera.node.app.spi.workflows.PreCheckException; From c1667be8480ae3bb5c15017483daec8ca95fb73c Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Tue, 14 Jan 2025 14:36:52 -0800 Subject: [PATCH 15/21] Spotless Signed-off-by: Kim Rader --- .../java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java index f6b0711326d9..1ab578c74bf7 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java @@ -33,7 +33,6 @@ import com.hedera.hapi.node.base.TokenAssociation; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; From cefff6d9a3351d9a7be0bea2e414e77cb13719ca Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Tue, 14 Jan 2025 15:56:10 -0800 Subject: [PATCH 16/21] Fix merge issues Signed-off-by: Kim Rader --- .../app/workflows/TransactionChecker.java | 2 +- .../node/app/workflows/TransactionInfo.java | 3 +- .../app/blocks/BlockStreamBuilderTest.java | 8 +- .../app/throttle/ThrottleAccumulatorTest.java | 4 +- .../app/workflows/TransactionCheckerTest.java | 98 +++++++++++++++++++ .../workflows/TransactionScenarioBuilder.java | 1 + .../handle/DispatchHandleContextTest.java | 14 ++- .../handle/dispatch/RecordFinalizerTest.java | 2 +- .../steps/HollowAccountCompletionsTest.java | 4 +- .../steps/PlatformStateUpdatesTest.java | 4 +- .../handle/steps/SystemFileUpdatesTest.java | 3 +- .../ingest/IngestWorkflowImplTest.java | 2 +- .../test/handlers/TokenMintHandlerTest.java | 2 +- 13 files changed, 131 insertions(+), 16 deletions(-) diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java index 695a54f6c099..69ee47d9682f 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java @@ -275,7 +275,7 @@ private void checkTransactionDeprecation(@NonNull final Transaction tx) throws P // as long as the transaction ALSO has either #2 or #3 populated. This seems really odd, and ideally // we would be able to remove support for #1 entirely. To do this, we need metrics to see if anyone // is using #1 in any way. - if (tx.hasSigs()) { + if (tx.hasBody() || tx.hasSigs()) { superDeprecatedCounter.increment(); } diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java index 304db426af04..54be9b39fb1a 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java @@ -38,7 +38,8 @@ * of this class, so we don't have to parse it all again later.

* * @param transaction The transaction itself - * @param txBody the deserialized {@link TransactionBody} (from the {@link Transaction#signedTransactionBytes()}). + * @param txBody the deserialized {@link TransactionBody} (either from the {@link Transaction#body()} or + * * from the {@link Transaction#signedTransactionBytes()}). * @param transactionID the validated {@link TransactionID} extracted from {@link #txBody} * @param payerID the validated {@link AccountID} of the payer extracted from {@link #transactionID} * @param signatureMap the {@link SignatureMap} (either from {@link Transaction#sigMap()} or diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java index 1ab578c74bf7..6e3c6a06ba23 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java @@ -33,9 +33,11 @@ import com.hedera.hapi.node.base.TokenAssociation; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.base.Transaction; +import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; +import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.AssessedCustomFee; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.TransactionRecord; @@ -59,9 +61,9 @@ public class BlockStreamBuilderTest { public static final int ENTROPY_NUMBER = 87372879; public static final String MEMO = "Yo Memo"; private Transaction transaction = Transaction.newBuilder() - // .body(TransactionBody.newBuilder() - // .cryptoTransfer(CryptoTransferTransactionBody.newBuilder().build()) - // .build()) + .body(TransactionBody.newBuilder() + .cryptoTransfer(CryptoTransferTransactionBody.newBuilder().build()) + .build()) .build(); private @Mock TransactionID transactionID; private final Bytes transactionBytes = Bytes.wrap("Hello Tester"); diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java index 950637363b33..b85980440e3e 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java @@ -1611,7 +1611,7 @@ private TransactionInfo scheduleCreate( .scheduleCreate(schedule) .build(); final var txn = Transaction.newBuilder().build(); - // final var txn = Schedule.newBuilder().originalCreateTransaction(body).build(); + final var txn = Schedule.newBuilder().originalCreateTransaction(body).build(); return new TransactionInfo( txn, body, @@ -1629,7 +1629,7 @@ private TransactionInfo scheduleSign(ScheduleID scheduleID) { .transactionID(TransactionID.newBuilder().accountID(PAYER_ID).build()) .scheduleSign(schedule) .build(); - final var txn = Transaction.newBuilder().build(); + final var txn = Transaction.newBuilder().body(body).build(); return new TransactionInfo( txn, body, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java index 04490a04e02a..61574ce9fec6 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java @@ -40,6 +40,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Duration; +import com.hedera.hapi.node.base.Signature; +import com.hedera.hapi.node.base.SignatureList; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.SignaturePair; import com.hedera.hapi.node.base.Timestamp; @@ -287,6 +289,30 @@ void happyDeprecatedPath() throws PreCheckException { assertThat(counterMetric("SuperDeprTxnsRcv").get()).isZero(); } + @Test + @DisplayName("A transaction with super deprecated fields alone will throw") + @SuppressWarnings("deprecation") + void parseAndCheckWithSuperDeprecatedFields() throws PreCheckException { + // Given a transaction using the super deprecated fields + final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); + final var localTx = Transaction.newBuilder() + .body(txBody) + .sigs(SignatureList.newBuilder().sigs(sig).build()) + .build(); + inputBuffer = Bytes.wrap(asByteArray(localTx)); + + // When we check, then we get a PreCheckException with INVALID_TRANSACTION_BODY + final var transaction = checker.parse(inputBuffer); + assertThatThrownBy(() -> checker.check(transaction, null)) + .isInstanceOf(PreCheckException.class) + .has(responseCode(INVALID_TRANSACTION_BODY)); + + // And the super deprecation counter has been incremented + assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); + // But the deprecation counter has not + assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); + } + @Test @DisplayName("If the transaction bytes are not valid protobuf, it will fail") void badTransactionProtobuf() { @@ -381,6 +407,78 @@ void happyWithDeprecatedFields() throws PreCheckException { } } + @Test + @DisplayName("A transaction with super deprecated fields alone will throw") + @SuppressWarnings("deprecation") + void happyWithSuperDeprecatedFields() { + // Given a transaction using the super deprecated fields + final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); + final var localTx = Transaction.newBuilder() + .body(txBody) + .sigs(SignatureList.newBuilder().sigs(sig).build()) + .build(); + + // When we check, then we get a PreCheckException with INVALID_TRANSACTION_BODY + assertThatThrownBy(() -> checker.check(localTx, null)) + .isInstanceOf(PreCheckException.class) + .has(responseCode(INVALID_TRANSACTION_BODY)); + + // And the super deprecation counter has been incremented + assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); + // But the deprecation counter has not + assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); + } + + @Test + @DisplayName( + "A transaction with super deprecated fields and signedTransactionBytes ignores super deprecated fields") + @SuppressWarnings("deprecation") + void checkWithSuperDeprecatedFieldsAndSignedTransactionBytes() throws PreCheckException { + // Given a transaction using the super deprecated fields and signedTransactionBytes + final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); + final var localTx = Transaction.newBuilder() + .body(txBody) + .sigs(SignatureList.newBuilder().sigs(sig).build()) + .signedTransactionBytes(asBytes(SignedTransaction.PROTOBUF, signedTx)) + .build(); + + // When we check + final var info = checker.check(localTx, null); + // Then the parsed data is as we expected + assertThat(info.transaction()).isEqualTo(localTx); + assertThat(info.txBody()).isEqualTo(txBody); + assertThat(info.signatureMap()).isEqualTo(signatureMap); + assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); + // And the super-deprecated counter is incremented, but not the deprecated counter + assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); + assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); + } + + @Test + @DisplayName("A transaction with super deprecated fields and deprecated fields ignores super deprecated fields") + @SuppressWarnings("deprecation") + void checkWithSuperDeprecatedFieldsAndDeprecatedFields() throws PreCheckException { + // Given a transaction using the super deprecated fields and signedTransactionBytes + final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); + final var localTx = Transaction.newBuilder() + .body(txBody) + .sigs(SignatureList.newBuilder().sigs(sig).build()) + .bodyBytes(asBytes(TransactionBody.PROTOBUF, txBody)) + .sigMap(signatureMap) + .build(); + + // When we check + final var info = checker.check(localTx, null); + // Then the parsed data is as we expected + assertThat(info.transaction()).isEqualTo(localTx); + assertThat(info.txBody()).isEqualTo(txBody); + assertThat(info.signatureMap()).isEqualTo(signatureMap); + assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); + // And the super-deprecated counter is incremented, and also the deprecated counter + assertThat(counterMetric("DeprTxnsRcv").get()).isEqualTo(1); + assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); + } + @Nested @DisplayName("Deprecated Fields tests") class DeprecatedFields { diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java index 1e65d00033c4..e0e1eb73f22e 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java @@ -114,6 +114,7 @@ public TransactionInfo txInfo() { final var signedTx = SignedTransaction.newBuilder().bodyBytes(signedbytes).build(); final var tx = Transaction.newBuilder() + .body(body) .signedTransactionBytes(asBytes(SignedTransaction.PROTOBUF, signedTx)) .build(); return new TransactionInfo(tx, body, SignatureMap.DEFAULT, signedbytes, function, null); diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java index f96a1980a769..0e1bb82cbf39 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java @@ -274,7 +274,12 @@ public class DispatchHandleContextTest extends StateTestBase implements Scenario .consensusSubmitMessage(ConsensusSubmitMessageTransactionBody.DEFAULT) .build(); private static final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().build(), txBody, SignatureMap.DEFAULT, Bytes.EMPTY, CRYPTO_TRANSFER, null); + Transaction.newBuilder().body(txBody).build(), + txBody, + SignatureMap.DEFAULT, + Bytes.EMPTY, + CRYPTO_TRANSFER, + null); private static final TransactionBody MISSING_PAYER_ID = TransactionBody.newBuilder().transactionID(TransactionID.DEFAULT).build(); @@ -747,7 +752,12 @@ private DispatchHandleContext createContext( } final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().build(), txBody, SignatureMap.DEFAULT, Bytes.EMPTY, function, null); + Transaction.newBuilder().body(txBody).build(), + txBody, + SignatureMap.DEFAULT, + Bytes.EMPTY, + function, + null); return new DispatchHandleContext( CONSENSUS_NOW, creatorInfo, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java index 2becd6ec3108..3f0339dbbb02 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java @@ -96,7 +96,7 @@ public class RecordFinalizerTest { .build(); private static final TransactionBody TX_BODY = asTxn(TRANSFER_BODY, PAYER_ID, CONSENSUS_NOW); private static final TransactionInfo TXN_INFO = new TransactionInfo( - Transaction.newBuilder().build(), + Transaction.newBuilder().body(TX_BODY).build(), TX_BODY, SignatureMap.DEFAULT, Bytes.EMPTY, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java index 5d6eccea3b42..b397f831477c 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java @@ -221,7 +221,7 @@ void completeHollowAccountsWithEthereumTransaction() { .ethereumTransaction(EthereumTransactionBody.DEFAULT) .build(); final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().build(), + Transaction.newBuilder().body(txnBody).build(), txnBody, SignatureMap.DEFAULT, transactionBytes, @@ -253,7 +253,7 @@ void ignoreEthereumTransactionIfNoCorrespondingSigs() { .ethereumTransaction(EthereumTransactionBody.DEFAULT) .build(); final TransactionInfo txnInfo = new TransactionInfo( - Transaction.newBuilder().build(), + Transaction.newBuilder().body(txnBody).build(), txnBody, SignatureMap.DEFAULT, transactionBytes, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java index c584c1c95699..768be96298c3 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java @@ -126,11 +126,13 @@ void setUp() { @Test void testMethodsWithInvalidArguments() { // given - final var txBody = TransactionBody.DEFAULT; + final var txBody = simpleCryptoTransfer().body(); // then assertThatThrownBy(() -> subject.handleTxBody(null, txBody, DEFAULT_CONFIG)) .isInstanceOf(NullPointerException.class); + assertThatThrownBy(() -> subject.handleTxBody(state, txBody, DEFAULT_CONFIG)) + .isInstanceOf(NullPointerException.class); assertThatThrownBy(() -> subject.handleTxBody(state, null, DEFAULT_CONFIG)) .isInstanceOf(NullPointerException.class); } diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java index 486a77fac015..7d41cc548d44 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java @@ -104,7 +104,7 @@ void setUp() { @Test void testMethodsWithInvalidArguments() { // given - final var txBody = TransactionBody.DEFAULT; + final var txBody = simpleCryptoTransfer().body(); // then assertThatThrownBy(() -> new SystemFileUpdates(null, exchangeRateManager, feeManager, throttleServiceManager)) @@ -119,6 +119,7 @@ void testMethodsWithInvalidArguments() { assertThatThrownBy(() -> subject.handleTxBody(null, txBody)).isInstanceOf(NullPointerException.class); assertThatThrownBy(() -> subject.handleTxBody(state, null)).isInstanceOf(NullPointerException.class); + assertThatThrownBy(() -> subject.handleTxBody(state, txBody)).isInstanceOf(NullPointerException.class); } @Test diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java index 8406f58da119..60e32c980460 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java @@ -134,7 +134,7 @@ void setup() throws PreCheckException { // TODO Mock out the metrics to return objects we can inspect later // Mock out the onset to always return a valid parsed object - transaction = Transaction.newBuilder().build(); + transaction = Transaction.newBuilder().body(transactionBody).build(); when(transactionChecker.parse(requestBuffer)).thenReturn(transaction); final var transactionInfo = new TransactionInfo( transaction, diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java index 62f266572848..fdc401c52916 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java @@ -293,7 +293,7 @@ private TransactionBody givenMintTxn(final TokenID tokenId, final List me .tokenMint(builder.build()) .build(); - final var txn = Transaction.DEFAULT; + final var txn = Transaction.newBuilder().body(txnBody).build(); recordBuilder.transaction(txn); given(handleContext.body()).willReturn(txnBody); From 818cdbc77626b445d1ef3458bd33c0a66cd25d39 Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Tue, 14 Jan 2025 16:07:24 -0800 Subject: [PATCH 17/21] Fix more merge issues Signed-off-by: Kim Rader --- .../node/app/workflows/TransactionInfo.java | 2 +- .../app/throttle/ThrottleAccumulatorTest.java | 3 +- .../app/workflows/TransactionCheckerTest.java | 131 +++++++++--------- 3 files changed, 68 insertions(+), 68 deletions(-) diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java index 54be9b39fb1a..646cffa8d670 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java @@ -39,7 +39,7 @@ * * @param transaction The transaction itself * @param txBody the deserialized {@link TransactionBody} (either from the {@link Transaction#body()} or - * * from the {@link Transaction#signedTransactionBytes()}). + * from the {@link Transaction#signedTransactionBytes()}). * @param transactionID the validated {@link TransactionID} extracted from {@link #txBody} * @param payerID the validated {@link AccountID} of the payer extracted from {@link #transactionID} * @param signatureMap the {@link SignatureMap} (either from {@link Transaction#sigMap()} or diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java index b85980440e3e..cafaa5033ec5 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java @@ -1610,8 +1610,7 @@ private TransactionInfo scheduleCreate( .transactionID(TransactionID.newBuilder().accountID(PAYER_ID).build()) .scheduleCreate(schedule) .build(); - final var txn = Transaction.newBuilder().build(); - final var txn = Schedule.newBuilder().originalCreateTransaction(body).build(); + final var txn = Transaction.newBuilder().body(body).build(); return new TransactionInfo( txn, body, diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java index 61574ce9fec6..54d2ec3a1b9f 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java @@ -405,78 +405,79 @@ void happyWithDeprecatedFields() throws PreCheckException { // But the super deprecation counter has not assertThat(counterMetric("SuperDeprTxnsRcv").get()).isZero(); } - } - @Test - @DisplayName("A transaction with super deprecated fields alone will throw") - @SuppressWarnings("deprecation") - void happyWithSuperDeprecatedFields() { - // Given a transaction using the super deprecated fields - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .build(); + @Test + @DisplayName("A transaction with super deprecated fields alone will throw") + @SuppressWarnings("deprecation") + void happyWithSuperDeprecatedFields() { + // Given a transaction using the super deprecated fields + final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); + final var localTx = Transaction.newBuilder() + .body(txBody) + .sigs(SignatureList.newBuilder().sigs(sig).build()) + .build(); - // When we check, then we get a PreCheckException with INVALID_TRANSACTION_BODY - assertThatThrownBy(() -> checker.check(localTx, null)) - .isInstanceOf(PreCheckException.class) - .has(responseCode(INVALID_TRANSACTION_BODY)); + // When we check, then we get a PreCheckException with INVALID_TRANSACTION_BODY + assertThatThrownBy(() -> checker.check(localTx, null)) + .isInstanceOf(PreCheckException.class) + .has(responseCode(INVALID_TRANSACTION_BODY)); - // And the super deprecation counter has been incremented - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - // But the deprecation counter has not - assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); - } + // And the super deprecation counter has been incremented + assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); + // But the deprecation counter has not + assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); + } - @Test - @DisplayName( - "A transaction with super deprecated fields and signedTransactionBytes ignores super deprecated fields") - @SuppressWarnings("deprecation") - void checkWithSuperDeprecatedFieldsAndSignedTransactionBytes() throws PreCheckException { - // Given a transaction using the super deprecated fields and signedTransactionBytes - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .signedTransactionBytes(asBytes(SignedTransaction.PROTOBUF, signedTx)) - .build(); + @Test + @DisplayName( + "A transaction with super deprecated fields and signedTransactionBytes ignores super deprecated fields") + @SuppressWarnings("deprecation") + void checkWithSuperDeprecatedFieldsAndSignedTransactionBytes() throws PreCheckException { + // Given a transaction using the super deprecated fields and signedTransactionBytes + final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); + final var localTx = Transaction.newBuilder() + .body(txBody) + .sigs(SignatureList.newBuilder().sigs(sig).build()) + .signedTransactionBytes(asBytes(SignedTransaction.PROTOBUF, signedTx)) + .build(); - // When we check - final var info = checker.check(localTx, null); - // Then the parsed data is as we expected - assertThat(info.transaction()).isEqualTo(localTx); - assertThat(info.txBody()).isEqualTo(txBody); - assertThat(info.signatureMap()).isEqualTo(signatureMap); - assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); - // And the super-deprecated counter is incremented, but not the deprecated counter - assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); - } + // When we check + final var info = checker.check(localTx, null); + // Then the parsed data is as we expected + assertThat(info.transaction()).isEqualTo(localTx); + assertThat(info.txBody()).isEqualTo(txBody); + assertThat(info.signatureMap()).isEqualTo(signatureMap); + assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); + // And the super-deprecated counter is incremented, but not the deprecated counter + assertThat(counterMetric("DeprTxnsRcv").get()).isZero(); + assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); + } - @Test - @DisplayName("A transaction with super deprecated fields and deprecated fields ignores super deprecated fields") - @SuppressWarnings("deprecation") - void checkWithSuperDeprecatedFieldsAndDeprecatedFields() throws PreCheckException { - // Given a transaction using the super deprecated fields and signedTransactionBytes - final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); - final var localTx = Transaction.newBuilder() - .body(txBody) - .sigs(SignatureList.newBuilder().sigs(sig).build()) - .bodyBytes(asBytes(TransactionBody.PROTOBUF, txBody)) - .sigMap(signatureMap) - .build(); + @Test + @DisplayName( + "A transaction with super deprecated fields and deprecated fields ignores super deprecated fields") + @SuppressWarnings("deprecation") + void checkWithSuperDeprecatedFieldsAndDeprecatedFields() throws PreCheckException { + // Given a transaction using the super deprecated fields and signedTransactionBytes + final var sig = Signature.newBuilder().ed25519(randomBytes(64)).build(); + final var localTx = Transaction.newBuilder() + .body(txBody) + .sigs(SignatureList.newBuilder().sigs(sig).build()) + .bodyBytes(asBytes(TransactionBody.PROTOBUF, txBody)) + .sigMap(signatureMap) + .build(); - // When we check - final var info = checker.check(localTx, null); - // Then the parsed data is as we expected - assertThat(info.transaction()).isEqualTo(localTx); - assertThat(info.txBody()).isEqualTo(txBody); - assertThat(info.signatureMap()).isEqualTo(signatureMap); - assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); - // And the super-deprecated counter is incremented, and also the deprecated counter - assertThat(counterMetric("DeprTxnsRcv").get()).isEqualTo(1); - assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); + // When we check + final var info = checker.check(localTx, null); + // Then the parsed data is as we expected + assertThat(info.transaction()).isEqualTo(localTx); + assertThat(info.txBody()).isEqualTo(txBody); + assertThat(info.signatureMap()).isEqualTo(signatureMap); + assertThat(info.functionality()).isEqualTo(CONSENSUS_CREATE_TOPIC); + // And the super-deprecated counter is incremented, and also the deprecated counter + assertThat(counterMetric("DeprTxnsRcv").get()).isEqualTo(1); + assertThat(counterMetric("SuperDeprTxnsRcv").get()).isEqualTo(1); + } } @Nested From efcd30eb0aec9a757f47d8917ebd231d81c4dd4d Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Wed, 15 Jan 2025 12:44:14 -0800 Subject: [PATCH 18/21] Initial commit Signed-off-by: Kim Rader --- .../services/state/schedule/schedule.proto | 2 +- .../services/transaction.proto | 530 +++++++++++++++- .../services/transaction_body.proto | 564 ------------------ 3 files changed, 529 insertions(+), 567 deletions(-) delete mode 100644 hapi/hedera-protobufs/services/transaction_body.proto diff --git a/hapi/hedera-protobufs/services/state/schedule/schedule.proto b/hapi/hedera-protobufs/services/state/schedule/schedule.proto index 904a50dac44f..724dda6bfa25 100644 --- a/hapi/hedera-protobufs/services/state/schedule/schedule.proto +++ b/hapi/hedera-protobufs/services/state/schedule/schedule.proto @@ -31,7 +31,7 @@ package proto; import "basic_types.proto"; import "timestamp.proto"; import "schedulable_transaction_body.proto"; -import "transaction_body.proto"; +import "transaction.proto"; option java_package = "com.hederahashgraph.api.proto.java"; // <<>> This comment is special code for setting PBJ Compiler java package diff --git a/hapi/hedera-protobufs/services/transaction.proto b/hapi/hedera-protobufs/services/transaction.proto index cffca41d7217..0990e243e90a 100644 --- a/hapi/hedera-protobufs/services/transaction.proto +++ b/hapi/hedera-protobufs/services/transaction.proto @@ -31,11 +31,77 @@ package proto; */ option java_package = "com.hederahashgraph.api.proto.java"; -// <<>> This comment is special code for setting PBJ Compiler java package option java_multiple_files = true; import "basic_types.proto"; -import "transaction_body.proto"; + +import "system_delete.proto"; +import "system_undelete.proto"; +import "freeze.proto"; + +import "contract_call.proto"; +import "contract_create.proto"; +import "contract_update.proto"; + +import "crypto_add_live_hash.proto"; +import "crypto_create.proto"; +import "crypto_delete.proto"; +import "crypto_delete_live_hash.proto"; +import "crypto_transfer.proto"; +import "crypto_update.proto"; +import "crypto_approve_allowance.proto"; +import "crypto_delete_allowance.proto"; + +import "ethereum_transaction.proto"; + +import "file_append.proto"; +import "file_create.proto"; +import "file_delete.proto"; +import "file_update.proto"; + +import "duration.proto"; +import "contract_delete.proto"; + +import "consensus_create_topic.proto"; +import "consensus_update_topic.proto"; +import "consensus_delete_topic.proto"; +import "consensus_submit_message.proto"; + +import "unchecked_submit.proto"; + +import "token_create.proto"; +import "token_freeze_account.proto"; +import "token_unfreeze_account.proto"; +import "token_grant_kyc.proto"; +import "token_revoke_kyc.proto"; +import "token_delete.proto"; +import "token_update.proto"; +import "token_mint.proto"; +import "token_burn.proto"; +import "token_wipe_account.proto"; +import "token_associate.proto"; +import "token_dissociate.proto"; +import "token_fee_schedule_update.proto"; +import "token_pause.proto"; +import "token_unpause.proto"; +import "token_update_nfts.proto"; +import "token_reject.proto"; +import "token_airdrop.proto"; +import "token_cancel_airdrop.proto"; +import "token_claim_airdrop.proto"; + +import "schedule_create.proto"; +import "schedule_delete.proto"; +import "schedule_sign.proto"; + +import "node_stake_update.proto"; +import "util_prng.proto"; + +import "node_create.proto"; +import "node_update.proto"; +import "node_delete.proto"; + +import "event/state_signature_transaction.proto"; /** * A wrapper around signed transaction bytes.
@@ -51,6 +117,7 @@ import "transaction_body.proto"; * The four deprecated fields will be removed and reserved in a future release. */ message Transaction { + // <<>> This comment is special code for setting PBJ Compiler java package /** * Replaced with `signedTransactionBytes`.
* The body of the transaction. @@ -84,3 +151,462 @@ message Transaction { */ bytes signedTransactionBytes = 5; } + +/** + * A transaction body. + * + * Every transaction is structured as a signed byte array. That byte array + * is a serialized `TransactionBody`. The transaction body contains the full + * content of the transaction, while the `SignedTransaction` includes a + * signature map for signatures authenticating that byte array, and that is + * serialized and transmitted wrapped in a `Transaction` message.
+ * The bulk of this message is a `oneof` block which offers the option for + * any one of the transaction messages for the network. + * This message also includes several additional fields to specify + * various parameters required to process a transaction. + */ +message TransactionBody { + // <<>> This comment is special code for setting PBJ Compiler java package + reserved 30, 61, 62, 63, 64; + + reserved "tssMessage", "tssVote", "tssShareSignature", "tssEncryptionKey"; + + /** + * A transaction identifier.
+ * Each transaction is uniquely identified by its transaction + * identifier. + *

+ * Each transaction identifier MUST be unique.
+ * Multiple transactions MAY be submitted with the same transaction + * identifier, but all except the first SHALL be rejected as duplicate + * transactions.
+ * This identifier MUST specify a `payer` account to be charged + * all fees associated with the transaction.
+ * This identifier MUST specify a "valid start time".
+ * The "valid start time" MUST be strictly _earlier_ than the current + * network consensus time.
+ * The "valid start time" MUST NOT be more than the current network + * configuration value for `transaction.maxValidDuration` seconds + * before the current network consensus time.
+ * This identifier MUST NOT set the `scheduled` flag.
+ * This identifier MUST NOT set a nonce value. + */ + TransactionID transactionID = 1; + + /** + * A node account identifier. + *

+ * This MUST identify the account of the consensus node to which + * this transaction is submitted. + */ + AccountID nodeAccountID = 2; + + /** + * A maximum transaction fee, in tinybar. + *

+ * The network SHALL NOT charge a transaction fee that exceeds this + * amount.
+ * The network MAY charge up to this amount, and reject the transaction, + * if the amount offered is insufficient to cover the required fees.
+ * The network MAY charge a minimum fee equal to 80% of the amount offered + * if the amount offered is much larger than the required fees. + */ + uint64 transactionFee = 3; + + /** + * A maximum duration in which to execute this transaction. + *

+ * This transaction SHALL be rejected as expired if the valid start time, + * extended by this duration, is less than the current network consensus + * time when the transaction is submitted.
+ * This transaction SHALL be rejected with an invalid duration if this + * value is greater than the current network configuration value for + * `transaction.maxValidDuration`. + */ + Duration transactionValidDuration = 4; + + /** + * Records are always generated.
+ * Obsolete option to not generate a record. + *

+ * This flag SHALL be ignored. Every transaction SHALL generate a record, + * or block stream equivalent. + */ + bool generateRecord = 5 [deprecated = true]; + + /** + * A short description for this transaction. + *

+ * This value, if set, MUST NOT exceed `transaction.maxMemoUtf8Bytes` + * (default 100) bytes when encoded as UTF-8. + */ + string memo = 6; + + // The fields here are ordered in strictly ascending field ordinal + // order due to limitations in PBJ. + oneof data { + /** + * Call a function defined on a smart contract. + */ + ContractCallTransactionBody contractCall = 7; + + /** + * Create a smart contract. + */ + ContractCreateTransactionBody contractCreateInstance = 8; + + /** + * Update a smart contract. + */ + ContractUpdateTransactionBody contractUpdateInstance = 9; + + /** + * An obsolete, and unsupported, operation to add a "live hash" to + * an account. + */ + CryptoAddLiveHashTransactionBody cryptoAddLiveHash = 10 [deprecated = true]; + + /** + * Create a new Hedera account. + */ + CryptoCreateTransactionBody cryptoCreateAccount = 11; + + /** + * Delete an Hedera account.
+ * This will mark the account as deleted, and transfer all remaining + * HBAR to a receiver account. + */ + CryptoDeleteTransactionBody cryptoDelete = 12; + + /** + * An obsolete, and unsupported, operation to remove a "live hash" from + * an account. + */ + CryptoDeleteLiveHashTransactionBody cryptoDeleteLiveHash = 13 [deprecated = true]; + + /** + * Transfer HBAR between accounts. + */ + CryptoTransferTransactionBody cryptoTransfer = 14; + + /** + * Modify an Hedera account. + */ + CryptoUpdateTransactionBody cryptoUpdateAccount = 15; + + /** + * Append data to the end of a file. + */ + FileAppendTransactionBody fileAppend = 16; + + /** + * Create a new file. + */ + FileCreateTransactionBody fileCreate = 17; + + /** + * Delete a file.
+ * This will remove the content of the file, and mark the file as + * deleted. + */ + FileDeleteTransactionBody fileDelete = 18; + + /** + * Modify a file.
+ * This may modify any metadata, and/or _replace_ the content. + */ + FileUpdateTransactionBody fileUpdate = 19; + + /** + * Delete a file as an Hedera administrative function.
+ * This is a privileged operation. + */ + SystemDeleteTransactionBody systemDelete = 20; + + /** + * Restore a file deleted via `systemDelete`.
+ * This is a privileged operation. + */ + SystemUndeleteTransactionBody systemUndelete = 21; + + /** + * Delete a smart contract and transfer remaining balance + * to a specified account. + */ + ContractDeleteTransactionBody contractDeleteInstance = 22; + + /** + * Freeze the network.
+ * This is actually several possible operations, and the caller + * should examine the "freeze service" for more detail.
+ * This is a privileged operation. + */ + FreezeTransactionBody freeze = 23; + + /** + * Create a topic. + */ + ConsensusCreateTopicTransactionBody consensusCreateTopic = 24; + + /** + * Update a topic. + */ + ConsensusUpdateTopicTransactionBody consensusUpdateTopic = 25; + + /** + * Delete a topic. + */ + ConsensusDeleteTopicTransactionBody consensusDeleteTopic = 26; + + /** + * Submit a message to a topic.
+ * A message may be "chunked", and submitted in parts, if the total + * message size exceeds the limit for a single transaction. + */ + ConsensusSubmitMessageTransactionBody consensusSubmitMessage = 27; + + /** + * Unsupported system transaction. + *

+ * This transaction MAY be implemented in testing networks, but + * SHALL NOT be enabled or supported in production environments.
+ * Clients MUST NOT call this method, and any such transaction SHALL + * be rejected.
+ * A network MAY choose to charge punitive fees for attempting to + * execute an `uncheckedSubmit`. + */ + UncheckedSubmitBody uncheckedSubmit = 28; + + /** + * Create a new Hedera token. + */ + TokenCreateTransactionBody tokenCreation = 29; + + /** + * Freeze an account with respect to a token.
+ * A frozen account cannot transact in that token until unfrozen. + */ + TokenFreezeAccountTransactionBody tokenFreeze = 31; + + /** + * Unfreeze an account with respect to a token. + */ + TokenUnfreezeAccountTransactionBody tokenUnfreeze = 32; + + /** + * Grant KYC to an account with respect to a token.
+ * KYC is generally a "know your customer" assertion that a + * responsible entity has sufficient information to positively + * identify the account holder to relevant authorities. + */ + TokenGrantKycTransactionBody tokenGrantKyc = 33; + + /** + * Revoke KYC from an account with respect to a token. + */ + TokenRevokeKycTransactionBody tokenRevokeKyc = 34; + + /** + * Delete an Hedera token.
+ * The token will be marked deleted. + */ + TokenDeleteTransactionBody tokenDeletion = 35; + + /** + * Update an Hedera token.
+ * Depending on what fields are to be modified, the signature + * requirements will vary. See `TokenUpdateTransactionBody` for + * further detail. + */ + TokenUpdateTransactionBody tokenUpdate = 36; + + /** + * Mint new tokens.
+ * All minted tokens will be delivered to the treasury account for + * the token type. The "mint key" for the token must sign this + * transaction. + */ + TokenMintTransactionBody tokenMint = 37; + + /** + * Burn tokens from the treasury account.
+ * The "burn key" for the token must sign this transaction. + */ + TokenBurnTransactionBody tokenBurn = 38; + + /** + * Wipe tokens from an account.
+ * This will remove a specified amount of fungible/common tokens or + * a specified list of non-fungible/unique serial numbered tokens + * of a given token type from an Hedera account. The removed tokens + * are _burned_ as if by a `tokenBurn` transaction.
+ * The "wipe key" for the token must sign this transaction. + */ + TokenWipeAccountTransactionBody tokenWipe = 39; + + /** + * Associate tokens to an account. + */ + TokenAssociateTransactionBody tokenAssociate = 40; + + /** + * Dissociate tokens from an account. + */ + TokenDissociateTransactionBody tokenDissociate = 41; + + /** + * Create a schedule.
+ * A schedule is a request to execute a specific transaction, included + * in the create body, in the future. The scheduled transaction may + * execute as soon as all signature requirements are met with the + * schedule create or a subsequent schedule sign transaction. + * A schedule may, alternatively, execute on expiration if + * long-term schedules are enabled and the schedule meets signature + * requirements at that time. + */ + ScheduleCreateTransactionBody scheduleCreate = 42; + + /** + * Delete a schedule.
+ * The schedule will be marked as deleted. + */ + ScheduleDeleteTransactionBody scheduleDelete = 43; + + /** + * Sign a schedule.
+ * Add one or more cryptographic keys to the list of keys that have + * signed a schedule, and which may serve to meet the signature + * requirements for the scheduled transaction. + */ + ScheduleSignTransactionBody scheduleSign = 44; + + /** + * Update the custom fee schedule for a token.
+ * This transaction must be signed by the "fee schedule key" + * for the token. + */ + TokenFeeScheduleUpdateTransactionBody token_fee_schedule_update = 45; + + /** + * Pause a Token. + *

+ * This transaction MUST be signed by the "pause key" for the token. + */ + TokenPauseTransactionBody token_pause = 46; + + /** + * Unpause a Token. + *

+ * This transaction MUST be signed by the "pause key" for the token. + */ + TokenUnpauseTransactionBody token_unpause = 47; + + /** + * Add one or more approved allowances for spenders to transfer the + * paying account's hbar or tokens. + */ + CryptoApproveAllowanceTransactionBody cryptoApproveAllowance = 48; + + /** + * Delete one or more approvals for spenders to transfer the + * paying account's hbar or tokens. + */ + CryptoDeleteAllowanceTransactionBody cryptoDeleteAllowance = 49; + + /** + * Perform an Ethereum encoded transaction. + */ + EthereumTransactionBody ethereumTransaction = 50; + + /** + * Update the staking information.
+ * This internal transaction is performed at the end of a staking + * period to complete staking calculations and indicate that new + * staking period has started. + */ + NodeStakeUpdateTransactionBody node_stake_update = 51; + + /** + * Provide a deterministic pseudorandom number based on network state. + */ + UtilPrngTransactionBody util_prng = 52; + + /** + * Update one or more non-fungible/unique tokens.
+ * This will update metadata for one or more serial numbers within + * a collection (token type). + */ + TokenUpdateNftsTransactionBody token_update_nfts = 53; + + /** + * Create a new node in the network address book.
+ * This is a privileged operation. + *

+ * This transaction SHALL create a new consensus node record and add + * that record to the network address book. + */ + com.hedera.hapi.node.addressbook.NodeCreateTransactionBody nodeCreate = 54; + + /** + * Update a node in the network address book.
+ * This is a privileged operation. + *

+ * This transaction SHALL update an existing consensus node record in + * the network address book. + */ + com.hedera.hapi.node.addressbook.NodeUpdateTransactionBody nodeUpdate = 55; + + /** + * Delete a node from the network address book.
+ * This is a privileged operation. + *

+ * This transaction SHALL mark an existing consensus node record as + * deleted and remove that node from the network address book. + */ + com.hedera.hapi.node.addressbook.NodeDeleteTransactionBody nodeDelete = 56; + + /** + * Reject and return a token to treasury.
+ * This transaction will transfer one or more tokens or token + * balances held by the requesting account to the treasury + * for each token type. + *

+ * Each transfer MUST be one of the following: + *

    + *
  • A single non-fungible/unique token.
    • + *
  • The full balance held for a fungible/common + * token type.
    • + *
+ * When complete, the requesting account SHALL NOT hold the + * rejected tokens.
+ * Custom fees and royalties defined for the tokens rejected + * SHALL NOT be charged for this transaction. + */ + TokenRejectTransactionBody tokenReject = 57; + + /** + * "Airdrop" tokens.
+ * This transaction sends tokens from one or more "sender" accounts + * to one or more "recipient" accounts. + *

+ * If a recipient account cannot immediately receive the token(s) sent, + * a "pending" airdrop SHALL be created and MUST be claimed. + */ + TokenAirdropTransactionBody tokenAirdrop = 58; + + /** + * Cancel one or more "pending" airdrops that are not yet claimed. + */ + TokenCancelAirdropTransactionBody tokenCancelAirdrop = 59; + + /** + * Claim one or more "pending" airdrops. + */ + TokenClaimAirdropTransactionBody tokenClaimAirdrop = 60; + + /** + * A transaction body for signature of a state root hash gossiped to other nodes + */ + com.hedera.hapi.platform.event.StateSignatureTransaction state_signature_transaction = 65; + } +} diff --git a/hapi/hedera-protobufs/services/transaction_body.proto b/hapi/hedera-protobufs/services/transaction_body.proto deleted file mode 100644 index b41e58563849..000000000000 --- a/hapi/hedera-protobufs/services/transaction_body.proto +++ /dev/null @@ -1,564 +0,0 @@ -/** - * # Transaction Body - * The body of a transaction, this message is serialized and signed. - * - * All of the entries in the `data` `oneof` are fully specified elsewhere; - * we only include a short summary here. - * - * ### 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; - -/* - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -option java_package = "com.hederahashgraph.api.proto.java"; -// <<>> This comment is special code for setting PBJ Compiler java package -option java_multiple_files = true; - -import "system_delete.proto"; -import "system_undelete.proto"; -import "freeze.proto"; - -import "contract_call.proto"; -import "contract_create.proto"; -import "contract_update.proto"; - -import "crypto_add_live_hash.proto"; -import "crypto_create.proto"; -import "crypto_delete.proto"; -import "crypto_delete_live_hash.proto"; -import "crypto_transfer.proto"; -import "crypto_update.proto"; -import "crypto_approve_allowance.proto"; -import "crypto_delete_allowance.proto"; - -import "ethereum_transaction.proto"; - -import "file_append.proto"; -import "file_create.proto"; -import "file_delete.proto"; -import "file_update.proto"; - -import "duration.proto"; -import "basic_types.proto"; -import "contract_delete.proto"; - -import "consensus_create_topic.proto"; -import "consensus_update_topic.proto"; -import "consensus_delete_topic.proto"; -import "consensus_submit_message.proto"; - -import "unchecked_submit.proto"; - -import "token_create.proto"; -import "token_freeze_account.proto"; -import "token_unfreeze_account.proto"; -import "token_grant_kyc.proto"; -import "token_revoke_kyc.proto"; -import "token_delete.proto"; -import "token_update.proto"; -import "token_mint.proto"; -import "token_burn.proto"; -import "token_wipe_account.proto"; -import "token_associate.proto"; -import "token_dissociate.proto"; -import "token_fee_schedule_update.proto"; -import "token_pause.proto"; -import "token_unpause.proto"; -import "token_update_nfts.proto"; -import "token_reject.proto"; -import "token_airdrop.proto"; -import "token_cancel_airdrop.proto"; -import "token_claim_airdrop.proto"; - -import "schedule_create.proto"; -import "schedule_delete.proto"; -import "schedule_sign.proto"; - -import "node_stake_update.proto"; -import "util_prng.proto"; - -import "node_create.proto"; -import "node_update.proto"; -import "node_delete.proto"; - -import "event/state_signature_transaction.proto"; - -/** - * A transaction body. - * - * Every transaction is structured as a signed byte array. That byte array - * is a serialized `TransactionBody`. The transaction body contains the full - * content of the transaction, while the `SignedTransaction` includes a - * signature map for signatures authenticating that byte array, and that is - * serialized and transmitted wrapped in a `Transaction` message.
- * The bulk of this message is a `oneof` block which offers the option for - * any one of the transaction messages for the network. - * This message also includes several additional fields to specify - * various parameters required to process a transaction. - */ -message TransactionBody { - reserved 30, 61, 62, 63, 64; - - reserved "tssMessage", "tssVote", "tssShareSignature", "tssEncryptionKey"; - - /** - * A transaction identifier.
- * Each transaction is uniquely identified by its transaction - * identifier. - *

- * Each transaction identifier MUST be unique.
- * Multiple transactions MAY be submitted with the same transaction - * identifier, but all except the first SHALL be rejected as duplicate - * transactions.
- * This identifier MUST specify a `payer` account to be charged - * all fees associated with the transaction.
- * This identifier MUST specify a "valid start time".
- * The "valid start time" MUST be strictly _earlier_ than the current - * network consensus time.
- * The "valid start time" MUST NOT be more than the current network - * configuration value for `transaction.maxValidDuration` seconds - * before the current network consensus time.
- * This identifier MUST NOT set the `scheduled` flag.
- * This identifier MUST NOT set a nonce value. - */ - TransactionID transactionID = 1; - - /** - * A node account identifier. - *

- * This MUST identify the account of the consensus node to which - * this transaction is submitted. - */ - AccountID nodeAccountID = 2; - - /** - * A maximum transaction fee, in tinybar. - *

- * The network SHALL NOT charge a transaction fee that exceeds this - * amount.
- * The network MAY charge up to this amount, and reject the transaction, - * if the amount offered is insufficient to cover the required fees.
- * The network MAY charge a minimum fee equal to 80% of the amount offered - * if the amount offered is much larger than the required fees. - */ - uint64 transactionFee = 3; - - /** - * A maximum duration in which to execute this transaction. - *

- * This transaction SHALL be rejected as expired if the valid start time, - * extended by this duration, is less than the current network consensus - * time when the transaction is submitted.
- * This transaction SHALL be rejected with an invalid duration if this - * value is greater than the current network configuration value for - * `transaction.maxValidDuration`. - */ - Duration transactionValidDuration = 4; - - /** - * Records are always generated.
- * Obsolete option to not generate a record. - *

- * This flag SHALL be ignored. Every transaction SHALL generate a record, - * or block stream equivalent. - */ - bool generateRecord = 5 [deprecated = true]; - - /** - * A short description for this transaction. - *

- * This value, if set, MUST NOT exceed `transaction.maxMemoUtf8Bytes` - * (default 100) bytes when encoded as UTF-8. - */ - string memo = 6; - - // The fields here are ordered in strictly ascending field ordinal - // order due to limitations in PBJ. - oneof data { - /** - * Call a function defined on a smart contract. - */ - ContractCallTransactionBody contractCall = 7; - - /** - * Create a smart contract. - */ - ContractCreateTransactionBody contractCreateInstance = 8; - - /** - * Update a smart contract. - */ - ContractUpdateTransactionBody contractUpdateInstance = 9; - - /** - * An obsolete, and unsupported, operation to add a "live hash" to - * an account. - */ - CryptoAddLiveHashTransactionBody cryptoAddLiveHash = 10 [deprecated = true]; - - /** - * Create a new Hedera account. - */ - CryptoCreateTransactionBody cryptoCreateAccount = 11; - - /** - * Delete an Hedera account.
- * This will mark the account as deleted, and transfer all remaining - * HBAR to a receiver account. - */ - CryptoDeleteTransactionBody cryptoDelete = 12; - - /** - * An obsolete, and unsupported, operation to remove a "live hash" from - * an account. - */ - CryptoDeleteLiveHashTransactionBody cryptoDeleteLiveHash = 13 [deprecated = true]; - - /** - * Transfer HBAR between accounts. - */ - CryptoTransferTransactionBody cryptoTransfer = 14; - - /** - * Modify an Hedera account. - */ - CryptoUpdateTransactionBody cryptoUpdateAccount = 15; - - /** - * Append data to the end of a file. - */ - FileAppendTransactionBody fileAppend = 16; - - /** - * Create a new file. - */ - FileCreateTransactionBody fileCreate = 17; - - /** - * Delete a file.
- * This will remove the content of the file, and mark the file as - * deleted. - */ - FileDeleteTransactionBody fileDelete = 18; - - /** - * Modify a file.
- * This may modify any metadata, and/or _replace_ the content. - */ - FileUpdateTransactionBody fileUpdate = 19; - - /** - * Delete a file as an Hedera administrative function.
- * This is a privileged operation. - */ - SystemDeleteTransactionBody systemDelete = 20; - - /** - * Restore a file deleted via `systemDelete`.
- * This is a privileged operation. - */ - SystemUndeleteTransactionBody systemUndelete = 21; - - /** - * Delete a smart contract and transfer remaining balance - * to a specified account. - */ - ContractDeleteTransactionBody contractDeleteInstance = 22; - - /** - * Freeze the network.
- * This is actually several possible operations, and the caller - * should examine the "freeze service" for more detail.
- * This is a privileged operation. - */ - FreezeTransactionBody freeze = 23; - - /** - * Create a topic. - */ - ConsensusCreateTopicTransactionBody consensusCreateTopic = 24; - - /** - * Update a topic. - */ - ConsensusUpdateTopicTransactionBody consensusUpdateTopic = 25; - - /** - * Delete a topic. - */ - ConsensusDeleteTopicTransactionBody consensusDeleteTopic = 26; - - /** - * Submit a message to a topic.
- * A message may be "chunked", and submitted in parts, if the total - * message size exceeds the limit for a single transaction. - */ - ConsensusSubmitMessageTransactionBody consensusSubmitMessage = 27; - - /** - * Unsupported system transaction. - *

- * This transaction MAY be implemented in testing networks, but - * SHALL NOT be enabled or supported in production environments.
- * Clients MUST NOT call this method, and any such transaction SHALL - * be rejected.
- * A network MAY choose to charge punitive fees for attempting to - * execute an `uncheckedSubmit`. - */ - UncheckedSubmitBody uncheckedSubmit = 28; - - /** - * Create a new Hedera token. - */ - TokenCreateTransactionBody tokenCreation = 29; - - /** - * Freeze an account with respect to a token.
- * A frozen account cannot transact in that token until unfrozen. - */ - TokenFreezeAccountTransactionBody tokenFreeze = 31; - - /** - * Unfreeze an account with respect to a token. - */ - TokenUnfreezeAccountTransactionBody tokenUnfreeze = 32; - - /** - * Grant KYC to an account with respect to a token.
- * KYC is generally a "know your customer" assertion that a - * responsible entity has sufficient information to positively - * identify the account holder to relevant authorities. - */ - TokenGrantKycTransactionBody tokenGrantKyc = 33; - - /** - * Revoke KYC from an account with respect to a token. - */ - TokenRevokeKycTransactionBody tokenRevokeKyc = 34; - - /** - * Delete an Hedera token.
- * The token will be marked deleted. - */ - TokenDeleteTransactionBody tokenDeletion = 35; - - /** - * Update an Hedera token.
- * Depending on what fields are to be modified, the signature - * requirements will vary. See `TokenUpdateTransactionBody` for - * further detail. - */ - TokenUpdateTransactionBody tokenUpdate = 36; - - /** - * Mint new tokens.
- * All minted tokens will be delivered to the treasury account for - * the token type. The "mint key" for the token must sign this - * transaction. - */ - TokenMintTransactionBody tokenMint = 37; - - /** - * Burn tokens from the treasury account.
- * The "burn key" for the token must sign this transaction. - */ - TokenBurnTransactionBody tokenBurn = 38; - - /** - * Wipe tokens from an account.
- * This will remove a specified amount of fungible/common tokens or - * a specified list of non-fungible/unique serial numbered tokens - * of a given token type from an Hedera account. The removed tokens - * are _burned_ as if by a `tokenBurn` transaction.
- * The "wipe key" for the token must sign this transaction. - */ - TokenWipeAccountTransactionBody tokenWipe = 39; - - /** - * Associate tokens to an account. - */ - TokenAssociateTransactionBody tokenAssociate = 40; - - /** - * Dissociate tokens from an account. - */ - TokenDissociateTransactionBody tokenDissociate = 41; - - /** - * Create a schedule.
- * A schedule is a request to execute a specific transaction, included - * in the create body, in the future. The scheduled transaction may - * execute as soon as all signature requirements are met with the - * schedule create or a subsequent schedule sign transaction. - * A schedule may, alternatively, execute on expiration if - * long-term schedules are enabled and the schedule meets signature - * requirements at that time. - */ - ScheduleCreateTransactionBody scheduleCreate = 42; - - /** - * Delete a schedule.
- * The schedule will be marked as deleted. - */ - ScheduleDeleteTransactionBody scheduleDelete = 43; - - /** - * Sign a schedule.
- * Add one or more cryptographic keys to the list of keys that have - * signed a schedule, and which may serve to meet the signature - * requirements for the scheduled transaction. - */ - ScheduleSignTransactionBody scheduleSign = 44; - - /** - * Update the custom fee schedule for a token.
- * This transaction must be signed by the "fee schedule key" - * for the token. - */ - TokenFeeScheduleUpdateTransactionBody token_fee_schedule_update = 45; - - /** - * Pause a Token. - *

- * This transaction MUST be signed by the "pause key" for the token. - */ - TokenPauseTransactionBody token_pause = 46; - - /** - * Unpause a Token. - *

- * This transaction MUST be signed by the "pause key" for the token. - */ - TokenUnpauseTransactionBody token_unpause = 47; - - /** - * Add one or more approved allowances for spenders to transfer the - * paying account's hbar or tokens. - */ - CryptoApproveAllowanceTransactionBody cryptoApproveAllowance = 48; - - /** - * Delete one or more approvals for spenders to transfer the - * paying account's hbar or tokens. - */ - CryptoDeleteAllowanceTransactionBody cryptoDeleteAllowance = 49; - - /** - * Perform an Ethereum encoded transaction. - */ - EthereumTransactionBody ethereumTransaction = 50; - - /** - * Update the staking information.
- * This internal transaction is performed at the end of a staking - * period to complete staking calculations and indicate that new - * staking period has started. - */ - NodeStakeUpdateTransactionBody node_stake_update = 51; - - /** - * Provide a deterministic pseudorandom number based on network state. - */ - UtilPrngTransactionBody util_prng = 52; - - /** - * Update one or more non-fungible/unique tokens.
- * This will update metadata for one or more serial numbers within - * a collection (token type). - */ - TokenUpdateNftsTransactionBody token_update_nfts = 53; - - /** - * Create a new node in the network address book.
- * This is a privileged operation. - *

- * This transaction SHALL create a new consensus node record and add - * that record to the network address book. - */ - com.hedera.hapi.node.addressbook.NodeCreateTransactionBody nodeCreate = 54; - - /** - * Update a node in the network address book.
- * This is a privileged operation. - *

- * This transaction SHALL update an existing consensus node record in - * the network address book. - */ - com.hedera.hapi.node.addressbook.NodeUpdateTransactionBody nodeUpdate = 55; - - /** - * Delete a node from the network address book.
- * This is a privileged operation. - *

- * This transaction SHALL mark an existing consensus node record as - * deleted and remove that node from the network address book. - */ - com.hedera.hapi.node.addressbook.NodeDeleteTransactionBody nodeDelete = 56; - - /** - * Reject and return a token to treasury.
- * This transaction will transfer one or more tokens or token - * balances held by the requesting account to the treasury - * for each token type. - *

- * Each transfer MUST be one of the following: - *

    - *
  • A single non-fungible/unique token.
    • - *
  • The full balance held for a fungible/common - * token type.
    • - *
- * When complete, the requesting account SHALL NOT hold the - * rejected tokens.
- * Custom fees and royalties defined for the tokens rejected - * SHALL NOT be charged for this transaction. - */ - TokenRejectTransactionBody tokenReject = 57; - - /** - * "Airdrop" tokens.
- * This transaction sends tokens from one or more "sender" accounts - * to one or more "recipient" accounts. - *

- * If a recipient account cannot immediately receive the token(s) sent, - * a "pending" airdrop SHALL be created and MUST be claimed. - */ - TokenAirdropTransactionBody tokenAirdrop = 58; - - /** - * Cancel one or more "pending" airdrops that are not yet claimed. - */ - TokenCancelAirdropTransactionBody tokenCancelAirdrop = 59; - - /** - * Claim one or more "pending" airdrops. - */ - TokenClaimAirdropTransactionBody tokenClaimAirdrop = 60; - - /** - * A transaction body for signature of a state root hash gossiped to other nodes - */ - com.hedera.hapi.platform.event.StateSignatureTransaction state_signature_transaction = 65; - } -} From 2cc60c37cb24c5dbbf0a45847f0b1b4e877a3a97 Mon Sep 17 00:00:00 2001 From: Kim Rader Date: Wed, 15 Jan 2025 16:35:07 -0800 Subject: [PATCH 19/21] Fix merge problems Signed-off-by: Kim Rader --- hapi/hedera-protobufs/services/transaction.proto | 2 ++ .../main/java/com/hedera/hapi/util/HapiUtils.java | 2 +- .../hedera/hapi/util/UnknownHederaFunctionality.java | 4 ++-- .../hedera/node/hapi/fixtures/TransactionHelper.java | 6 +++--- .../node/app/hapi/utils/CommonPbjConverters.java | 4 ++-- .../addressbook/impl/handlers/NodeCreateHandler.java | 4 ++-- .../addressbook/impl/handlers/NodeDeleteHandler.java | 4 ++-- .../addressbook/impl/handlers/NodeUpdateHandler.java | 4 ++-- .../impl/test/handlers/NodeCreateHandlerTest.java | 4 ++-- .../impl/test/handlers/NodeDeleteHandlerTest.java | 4 ++-- .../impl/test/handlers/NodeUpdateHandlerTest.java | 4 ++-- .../java/com/hedera/node/app/spi/AppContext.java | 4 ++-- .../node/app/spi/authorization/Authorizer.java | 4 ++-- .../com/hedera/node/app/spi/fees/FeeContext.java | 4 ++-- .../com/hedera/node/app/spi/store/StoreFactory.java | 4 ++-- .../com/hedera/node/app/spi/throttle/Throttle.java | 4 ++-- .../node/app/spi/workflows/DispatchOptions.java | 4 ++-- .../hedera/node/app/spi/workflows/HandleContext.java | 4 ++-- .../node/app/spi/workflows/PreHandleContext.java | 4 ++-- .../hedera/node/app/spi/workflows/SystemContext.java | 4 ++-- .../node/app/spi/workflows/TransactionHandler.java | 4 ++-- .../hedera/node/app/spi/workflows/WarmupContext.java | 4 ++-- .../node/app/spi/workflows/record/StreamBuilder.java | 4 ++-- .../node/app/spi/fixtures/TransactionFactory.java | 4 ++-- .../spi/fixtures/workflows/FakePreHandleContext.java | 4 ++-- .../src/main/java/com/hedera/node/app/Hedera.java | 2 +- .../node/app/authorization/AuthorizerImpl.java | 4 ++-- .../node/app/authorization/PrivilegesVerifier.java | 4 ++-- .../node/app/blocks/impl/BlockStreamBuilder.java | 4 ++-- .../node/app/blocks/impl/PairedStreamBuilder.java | 4 ++-- .../hedera/node/app/fees/ChildFeeContextImpl.java | 4 ++-- .../com/hedera/node/app/fees/FeeCalculatorImpl.java | 4 ++-- .../com/hedera/node/app/fees/FeeContextImpl.java | 4 ++-- .../java/com/hedera/node/app/fees/FeeManager.java | 4 ++-- .../app/fees/congestion/CongestionMultipliers.java | 4 ++-- .../UtilizationScaledThrottleMultiplier.java | 4 ++-- .../hedera/node/app/services/ServiceScopeLookup.java | 2 +- .../app/state/logging/TransactionStateLogger.java | 4 ++-- .../hedera/node/app/throttle/AppThrottleFactory.java | 4 ++-- .../app/throttle/NetworkUtilizationManagerImpl.java | 4 ++-- .../node/app/throttle/ThrottleAccumulator.java | 4 ++-- .../node/app/throttle/ThrottleServiceManager.java | 4 ++-- .../hedera/node/app/workflows/SolvencyPreCheck.java | 4 ++-- .../node/app/workflows/TransactionChecker.java | 4 ++-- .../hedera/node/app/workflows/TransactionInfo.java | 4 ++-- .../workflows/dispatcher/TransactionDispatcher.java | 2 +- .../app/workflows/handle/DispatchHandleContext.java | 4 ++-- .../node/app/workflows/handle/cache/CacheWarmer.java | 4 ++-- .../handle/dispatch/ChildDispatchFactory.java | 4 ++-- .../workflows/handle/dispatch/RecordFinalizer.java | 4 ++-- .../workflows/handle/record/RecordStreamBuilder.java | 4 ++-- .../app/workflows/handle/record/SystemSetup.java | 2 +- .../handle/steps/HollowAccountCompletions.java | 4 ++-- .../workflows/handle/steps/PlatformStateUpdates.java | 2 +- .../workflows/handle/steps/SystemFileUpdates.java | 4 ++-- .../app/workflows/handle/steps/UserTxnFactory.java | 4 ++-- .../handle/throttle/DispatchUsageManager.java | 4 ++-- .../node/app/workflows/ingest/SubmissionManager.java | 4 ++-- .../workflows/prehandle/PreHandleContextImpl.java | 4 ++-- .../workflows/prehandle/PreHandleWorkflowImpl.java | 2 +- .../node/app/workflows/query/QueryWorkflowImpl.java | 4 ++-- .../workflows/standalone/TransactionExecutor.java | 4 ++-- .../standalone/impl/StandaloneDispatchFactory.java | 4 ++-- .../app/authorization/PrivilegesVerifierTest.java | 8 ++++---- .../node/app/blocks/BlockStreamBuilderTest.java | 4 ++-- .../node/app/fees/ChildFeeContextImplTest.java | 4 ++-- .../hedera/node/app/fees/FeeCalculatorImplTest.java | 4 ++-- .../UtilizationScaledThrottleMultiplierTest.java | 4 ++-- .../node/app/throttle/AppThrottleAdviserTest.java | 4 ++-- .../node/app/throttle/AppThrottleFactoryTest.java | 4 ++-- .../node/app/throttle/ThrottleAccumulatorTest.java | 4 ++-- .../impl/NetworkUtilizationManagerImplTest.java | 4 ++-- .../node/app/workflows/SolvencyPreCheckTest.java | 4 ++-- .../node/app/workflows/TransactionCheckerTest.java | 4 ++-- .../app/workflows/TransactionScenarioBuilder.java | 4 ++-- .../workflows/handle/DispatchHandleContextTest.java | 4 ++-- .../app/workflows/handle/DispatchProcessorTest.java | 4 ++-- .../handle/dispatch/ChildDispatchFactoryTest.java | 4 ++-- .../handle/dispatch/RecordFinalizerTest.java | 4 ++-- .../handle/dispatch/ValidationReporterTest.java | 4 ++-- .../app/workflows/handle/record/RecordTestData.java | 4 ++-- .../handle/steps/HollowAccountCompletionsTest.java | 4 ++-- .../handle/steps/PlatformStateUpdatesTest.java | 2 +- .../handle/steps/SystemFileUpdatesTest.java | 4 ++-- .../node/app/workflows/handle/steps/UserTxnTest.java | 4 ++-- .../handle/throttle/DispatchUsageManagerTest.java | 4 ++-- .../node/app/workflows/ingest/IngestCheckerTest.java | 4 ++-- .../app/workflows/ingest/IngestWorkflowImplTest.java | 4 ++-- .../app/workflows/ingest/SubmissionManagerTest.java | 4 ++-- .../prehandle/PreHandleContextImplTest.java | 4 ++-- .../prehandle/PreHandleContextListUpdatesTest.java | 4 ++-- .../node/app/workflows/query/QueryCheckerTest.java | 4 ++-- .../app/workflows/query/QueryWorkflowImplTest.java | 4 ++-- .../standalone/TransactionExecutorsTest.java | 2 +- .../impl/handlers/ConsensusCreateTopicHandler.java | 4 ++-- .../impl/handlers/ConsensusDeleteTopicHandler.java | 4 ++-- .../impl/handlers/ConsensusSubmitMessageHandler.java | 4 ++-- .../impl/handlers/ConsensusUpdateTopicHandler.java | 4 ++-- .../impl/test/handlers/ConsensusCreateTopicTest.java | 4 ++-- .../impl/test/handlers/ConsensusDeleteTopicTest.java | 4 ++-- .../handlers/ConsensusSubmitMessageHandlerTest.java | 4 ++-- .../handlers/ConsensusUpdateTopicHandlerTest.java | 4 ++-- .../file/impl/handlers/FileAppendHandler.java | 4 ++-- .../file/impl/handlers/FileCreateHandler.java | 4 ++-- .../file/impl/handlers/FileDeleteHandler.java | 4 ++-- .../file/impl/handlers/FileSignatureWaiversImpl.java | 4 ++-- .../file/impl/handlers/FileSystemDeleteHandler.java | 4 ++-- .../impl/handlers/FileSystemUndeleteHandler.java | 4 ++-- .../file/impl/handlers/FileUpdateHandler.java | 4 ++-- .../service/file/impl/schemas/V0490FileSchema.java | 2 +- .../impl/test/handlers/FileAppendHandlerTest.java | 4 ++-- .../file/impl/test/handlers/FileCreateTest.java | 4 ++-- .../file/impl/test/handlers/FileDeleteTest.java | 4 ++-- .../test/handlers/FileSignatureWaiversImplTest.java | 4 ++-- .../impl/test/handlers/FileSystemDeleteTest.java | 4 ++-- .../impl/test/handlers/FileSystemUndeleteTest.java | 4 ++-- .../file/impl/test/handlers/FileUpdateTest.java | 4 ++-- .../node/app/service/file/FileSignatureWaivers.java | 4 ++-- .../networkadmin/impl/handlers/FreezeHandler.java | 4 ++-- .../impl/handlers/NetworkUncheckedSubmitHandler.java | 4 ++-- .../impl/test/handlers/FreezeHandlerTest.java | 4 ++-- .../impl/handlers/AbstractScheduleHandler.java | 4 ++-- .../schedule/impl/handlers/HandlerUtility.java | 2 +- .../impl/handlers/ScheduleCreateHandler.java | 2 +- .../impl/handlers/ScheduleDeleteHandler.java | 4 ++-- .../schedule/impl/handlers/ScheduleSignHandler.java | 4 ++-- .../app/service/schedule/impl/ScheduleTestBase.java | 4 ++-- .../schedule/impl/ScheduledTransactionFactory.java | 4 ++-- .../schedule/impl/handlers/HandlerUtilityTest.java | 4 ++-- .../impl/handlers/ScheduleCreateHandlerTest.java | 4 ++-- .../impl/handlers/ScheduleDeleteHandlerTest.java | 4 ++-- .../impl/handlers/ScheduleSignHandlerTest.java | 4 ++-- .../node/app/service/schedule/ExecutableTxn.java | 4 ++-- .../impl/exec/gas/DispatchGasCalculator.java | 4 ++-- .../impl/exec/gas/SystemContractGasCalculator.java | 4 ++-- .../exec/scope/HandleHederaNativeOperations.java | 4 ++-- .../impl/exec/scope/HandleHederaOperations.java | 4 ++-- .../exec/scope/HandleSystemContractOperations.java | 4 ++-- .../exec/scope/QuerySystemContractOperations.java | 4 ++-- .../impl/exec/scope/SystemContractOperations.java | 4 ++-- .../exec/systemcontracts/PrngSystemContract.java | 4 ++-- .../has/hbarapprove/HbarApproveCall.java | 4 ++-- .../has/hbarapprove/HbarApproveTranslator.java | 4 ++-- .../SetUnlimitedAutoAssociationsCall.java | 4 ++-- .../SetUnlimitedAutoAssociationsTranslator.java | 4 ++-- .../hss/DispatchForResponseCodeHssCall.java | 4 ++-- .../hss/schedulenative/ScheduleNativeCall.java | 4 ++-- .../hss/schedulenative/ScheduleNativeTranslator.java | 4 ++-- .../hss/signschedule/SignScheduleTranslator.java | 2 +- .../exec/systemcontracts/hts/AddressIdConverter.java | 6 +++--- .../hts/DispatchForResponseCodeHtsCall.java | 4 ++-- .../hts/airdrops/TokenAirdropDecoder.java | 4 ++-- .../hts/airdrops/TokenAirdropTranslator.java | 4 ++-- .../hts/associations/AssociationsDecoder.java | 4 ++-- .../hts/associations/AssociationsTranslator.java | 4 ++-- .../exec/systemcontracts/hts/burn/BurnDecoder.java | 4 ++-- .../systemcontracts/hts/burn/BurnTranslator.java | 4 ++-- .../cancelairdrops/TokenCancelAirdropDecoder.java | 4 ++-- .../cancelairdrops/TokenCancelAirdropTranslator.java | 4 ++-- .../hts/claimairdrops/TokenClaimAirdropDecoder.java | 4 ++-- .../claimairdrops/TokenClaimAirdropTranslator.java | 4 ++-- .../hts/create/ClassicCreatesCall.java | 4 ++-- .../systemcontracts/hts/create/CreateDecoder.java | 4 ++-- .../hts/create/CreateDecoderFunction.java | 4 ++-- .../systemcontracts/hts/create/CreateTranslator.java | 4 ++-- .../systemcontracts/hts/delete/DeleteTranslator.java | 4 ++-- .../hts/freeze/FreezeUnfreezeDecoder.java | 4 ++-- .../hts/freeze/FreezeUnfreezeTranslator.java | 4 ++-- .../hts/grantapproval/AbstractGrantApprovalCall.java | 4 ++-- .../hts/grantapproval/GrantApprovalDecoder.java | 4 ++-- .../hts/grantapproval/GrantApprovalTranslator.java | 4 ++-- .../hts/grantrevokekyc/GrantRevokeKycDecoder.java | 4 ++-- .../hts/grantrevokekyc/GrantRevokeKycTranslator.java | 4 ++-- .../exec/systemcontracts/hts/mint/MintDecoder.java | 4 ++-- .../systemcontracts/hts/mint/MintTranslator.java | 4 ++-- .../systemcontracts/hts/pauses/PausesDecoder.java | 4 ++-- .../systemcontracts/hts/pauses/PausesTranslator.java | 4 ++-- .../hts/rejecttokens/RejectTokensDecoder.java | 4 ++-- .../hts/rejecttokens/RejectTokensTranslator.java | 4 ++-- .../hts/setapproval/SetApprovalForAllCall.java | 4 ++-- .../hts/setapproval/SetApprovalForAllDecoder.java | 4 ++-- .../hts/setapproval/SetApprovalForAllTranslator.java | 4 ++-- .../hts/transfer/ClassicTransfersCall.java | 4 ++-- .../hts/transfer/ClassicTransfersDecoder.java | 4 ++-- .../hts/transfer/ClassicTransfersTranslator.java | 4 ++-- .../hts/transfer/Erc20TransfersCall.java | 4 ++-- .../hts/transfer/Erc721TransferFromCall.java | 4 ++-- .../systemcontracts/hts/update/UpdateDecoder.java | 4 ++-- .../hts/update/UpdateDecoderFunction.java | 4 ++-- .../hts/update/UpdateExpiryTranslator.java | 4 ++-- .../hts/update/UpdateKeysTranslator.java | 4 ++-- .../hts/update/UpdateNFTsMetadataTranslator.java | 4 ++-- .../systemcontracts/hts/update/UpdateTranslator.java | 4 ++-- .../UpdateTokenCustomFeesDecoder.java | 4 ++-- .../UpdateTokenCustomFeesTranslator.java | 4 ++-- .../exec/systemcontracts/hts/wipe/WipeDecoder.java | 4 ++-- .../systemcontracts/hts/wipe/WipeTranslator.java | 4 ++-- .../contract/impl/exec/utils/SchedulingUtility.java | 4 ++-- .../handlers/AbstractContractTransactionHandler.java | 4 ++-- .../contract/impl/handlers/ContractCallHandler.java | 4 ++-- .../impl/handlers/ContractCreateHandler.java | 4 ++-- .../impl/handlers/ContractDeleteHandler.java | 4 ++-- .../impl/handlers/ContractSystemDeleteHandler.java | 4 ++-- .../impl/handlers/ContractSystemUndeleteHandler.java | 4 ++-- .../impl/handlers/ContractUpdateHandler.java | 4 ++-- .../impl/handlers/EthereumTransactionHandler.java | 4 ++-- .../contract/impl/infra/HevmTransactionFactory.java | 4 ++-- .../app/service/contract/impl/test/TestHelpers.java | 4 ++-- .../test/exec/ContextTransactionProcessorTest.java | 4 ++-- .../contract/impl/test/exec/QueryModuleTest.java | 4 ++-- .../impl/test/exec/TransactionModuleTest.java | 4 ++-- .../exec/gas/SystemContractGasCalculatorTest.java | 4 ++-- .../exec/scope/HandleHederaNativeOperationsTest.java | 4 ++-- .../test/exec/scope/HandleHederaOperationsTest.java | 4 ++-- .../scope/HandleSystemContractOperationsTest.java | 4 ++-- .../scope/QuerySystemContractOperationsTest.java | 4 ++-- .../has/hbarApprove/HbarApproveCallTest.java | 4 ++-- .../SetUnlimitedAutoAssociationsCallTest.java | 4 ++-- .../hss/DispatchForResponseCodeHssCallTest.java | 4 ++-- .../schedulenative/ScheduleNativeTranslatorTest.java | 2 +- .../hss/signschedule/SignScheduleTranslatorTest.java | 2 +- .../hts/DispatchForResponseCodeHtsCallTest.java | 4 ++-- .../exec/systemcontracts/hts/HtsCallAttemptTest.java | 4 ++-- .../hts/airdrops/TokenAirdropTranslatorTest.java | 4 ++-- .../hts/associations/AssociationsDecoderTest.java | 4 ++-- .../hts/associations/AssociationsTranslatorTest.java | 4 ++-- .../TokenCancelAirdropTranslatorTest.java | 4 ++-- .../TokenClaimAirdropTranslatorTest.java | 4 ++-- .../hts/create/ClassicCreatesCallTest.java | 4 ++-- .../hts/create/CreateDecoderTest.java | 4 ++-- .../hts/freeze/FreezeUnfreezeDecoderTest.java | 4 ++-- .../hts/grantapproval/ERCGrantApprovalCallTest.java | 4 ++-- .../hts/grantapproval/GrantApprovalDecoderTest.java | 4 ++-- .../grantrevokekyc/GrantRevokeKycDecoderTest.java | 4 ++-- .../hts/pauses/PausesDecoderTest.java | 4 ++-- .../hts/rejecttokens/RejectTokensTranslatorTest.java | 4 ++-- .../hts/setapproval/SetApprovalForAllCallTest.java | 4 ++-- .../setapproval/SetApprovalForAllDecoderTest.java | 4 ++-- .../hts/transfer/ClassicTransfersCallTest.java | 4 ++-- .../hts/transfer/ClassicTransfersDecoderTest.java | 4 ++-- .../hts/transfer/ClassicTransfersGasCalcTest.java | 4 ++-- .../hts/transfer/Erc20TransfersCallTest.java | 4 ++-- .../hts/transfer/Erc721TransferFromCallTest.java | 4 ++-- .../hts/update/UpdateTranslatorTest.java | 4 ++-- .../impl/test/handlers/ContractCallHandlerTest.java | 4 ++-- .../test/handlers/ContractCreateHandlerTest.java | 4 ++-- .../test/handlers/ContractDeleteHandlerTest.java | 4 ++-- .../test/handlers/ContractUpdateHandlerTest.java | 4 ++-- .../handlers/EthereumTransactionHandlerTest.java | 4 ++-- .../test/infra/HevmStaticTransactionFactoryTest.java | 4 ++-- .../impl/test/infra/HevmTransactionFactoryTest.java | 4 ++-- .../token/impl/CryptoSignatureWaiversImpl.java | 4 ++-- .../impl/handlers/CryptoAddLiveHashHandler.java | 4 ++-- .../impl/handlers/CryptoApproveAllowanceHandler.java | 4 ++-- .../token/impl/handlers/CryptoCreateHandler.java | 4 ++-- .../impl/handlers/CryptoDeleteAllowanceHandler.java | 4 ++-- .../token/impl/handlers/CryptoDeleteHandler.java | 4 ++-- .../impl/handlers/CryptoDeleteLiveHashHandler.java | 4 ++-- .../token/impl/handlers/CryptoTransferHandler.java | 4 ++-- .../token/impl/handlers/CryptoUpdateHandler.java | 4 ++-- .../token/impl/handlers/TokenAccountWipeHandler.java | 4 ++-- .../token/impl/handlers/TokenAirdropHandler.java | 4 ++-- .../handlers/TokenAssociateToAccountHandler.java | 4 ++-- .../token/impl/handlers/TokenBurnHandler.java | 4 ++-- .../impl/handlers/TokenCancelAirdropHandler.java | 2 +- .../impl/handlers/TokenClaimAirdropHandler.java | 4 ++-- .../token/impl/handlers/TokenCreateHandler.java | 4 ++-- .../token/impl/handlers/TokenDeleteHandler.java | 4 ++-- .../handlers/TokenDissociateFromAccountHandler.java | 4 ++-- .../impl/handlers/TokenFeeScheduleUpdateHandler.java | 4 ++-- .../impl/handlers/TokenFreezeAccountHandler.java | 4 ++-- .../impl/handlers/TokenGrantKycToAccountHandler.java | 4 ++-- .../token/impl/handlers/TokenMintHandler.java | 4 ++-- .../token/impl/handlers/TokenPauseHandler.java | 4 ++-- .../token/impl/handlers/TokenRejectHandler.java | 4 ++-- .../handlers/TokenRevokeKycFromAccountHandler.java | 4 ++-- .../impl/handlers/TokenUnfreezeAccountHandler.java | 4 ++-- .../token/impl/handlers/TokenUnpauseHandler.java | 4 ++-- .../token/impl/handlers/TokenUpdateHandler.java | 4 ++-- .../token/impl/handlers/TokenUpdateNftsHandler.java | 4 ++-- .../handlers/staking/EndOfStakingPeriodUtils.java | 4 ++-- .../transfer/AssociateTokenRecipientsStep.java | 4 ++-- .../impl/handlers/transfer/AutoAccountCreator.java | 4 ++-- .../impl/handlers/transfer/TransferExecutor.java | 4 ++-- .../impl/test/CryptoSignatureWaiversImplTest.java | 4 ++-- .../test/handlers/CryptoAddLiveHashHandlerTest.java | 4 ++-- .../handlers/CryptoApproveAllowanceHandlerTest.java | 4 ++-- .../impl/test/handlers/CryptoCreateHandlerTest.java | 4 ++-- .../handlers/CryptoDeleteAllowanceHandlerTest.java | 4 ++-- .../impl/test/handlers/CryptoDeleteHandlerTest.java | 4 ++-- .../CryptoTransferHandlerPureChecksTest.java | 4 ++-- .../test/handlers/CryptoTransferHandlerTest.java | 4 ++-- .../test/handlers/CryptoTransferHandlerTestBase.java | 4 ++-- .../impl/test/handlers/CryptoUpdateHandlerTest.java | 4 ++-- .../test/handlers/TokenAccountWipeHandlerTest.java | 4 ++-- .../impl/test/handlers/TokenAirdropHandlerTest.java | 4 ++-- .../handlers/TokenAssociateToAccountHandlerTest.java | 4 ++-- .../impl/test/handlers/TokenBurnHandlerTest.java | 4 ++-- .../TokenCancelAirdropHandlerPureChecksTest.java | 2 +- .../test/handlers/TokenCancelAirdropHandlerTest.java | 4 ++-- .../impl/test/handlers/TokenCreateHandlerTest.java | 6 +++--- .../impl/test/handlers/TokenDeleteHandlerTest.java | 4 ++-- .../TokenDissociateFromAccountHandlerTest.java | 4 ++-- .../handlers/TokenFeeScheduleUpdateHandlerTest.java | 4 ++-- .../test/handlers/TokenFreezeAccountHandlerTest.java | 4 ++-- .../handlers/TokenGrantKycToAccountHandlerTest.java | 4 ++-- .../impl/test/handlers/TokenMintHandlerTest.java | 4 ++-- .../impl/test/handlers/TokenPauseHandlerTest.java | 4 ++-- .../impl/test/handlers/TokenRejectHandlerTest.java | 4 ++-- .../TokenRevokeKycFromAccountHandlerTest.java | 4 ++-- .../handlers/TokenUnfreezeAccountHandlerTest.java | 4 ++-- .../impl/test/handlers/TokenUnpauseHandlerTest.java | 4 ++-- .../impl/test/handlers/TokenUpdateHandlerTest.java | 6 +++--- .../test/handlers/TokenUpdateNftsHandlerTest.java | 4 ++-- .../staking/EndOfStakingPeriodUpdaterTest.java | 2 +- .../test/handlers/staking/StakeInfoHelperTest.java | 4 ++-- .../token/impl/test/handlers/transfer/StepsBase.java | 4 ++-- .../validators/ApproveAllowanceValidatorTest.java | 4 ++-- .../validators/DeleteAllowanceValidatorTest.java | 4 ++-- .../app/service/token/CryptoSignatureWaivers.java | 4 ++-- .../node/app/service/token/api/TokenServiceApi.java | 4 ++-- .../util/impl/handlers/AtomicBatchHandler.java | 2 +- .../service/util/impl/handlers/UtilPrngHandler.java | 4 ++-- .../util/impl/test/handlers/UtilPrngHandlerTest.java | 4 ++-- .../translators/inputs/BlockTransactionParts.java | 4 ++-- .../support/translators/inputs/TransactionParts.java | 4 ++-- .../validators/block/BlockItemNonceValidator.java | 2 +- .../services/bdd/spec/transactions/TxnFactory.java | 12 ++++++------ .../services/bdd/spec/utilops/EmbeddedVerbs.java | 2 +- .../hedera/services/bdd/spec/utilops/UtilVerbs.java | 2 +- 330 files changed, 648 insertions(+), 646 deletions(-) diff --git a/hapi/hedera-protobufs/services/transaction.proto b/hapi/hedera-protobufs/services/transaction.proto index 49f5de6451dd..07c5178eee1a 100644 --- a/hapi/hedera-protobufs/services/transaction.proto +++ b/hapi/hedera-protobufs/services/transaction.proto @@ -166,6 +166,7 @@ message Transaction { * various parameters required to process a transaction. */ message TransactionBody { + // <<>> This comment is special code for setting PBJ Compiler java package reserved 30, 61, 62, 63, 64; reserved "tssMessage", "tssVote", "tssShareSignature", "tssEncryptionKey"; @@ -621,5 +622,6 @@ message TransactionBody { * Create an atomic batch. */ message AtomicBatchTransactionBody { + // <<>> This comment is special code for setting PBJ Compiler java package repeated Transaction transactions = 1; } diff --git a/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java b/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java index 6baf61b17392..b2c6c8b22dad 100644 --- a/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java +++ b/hapi/src/main/java/com/hedera/hapi/util/HapiUtils.java @@ -25,9 +25,9 @@ import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.SemanticVersion; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.transaction.Query; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.pbj.runtime.io.buffer.Bytes; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hapi/src/main/java/com/hedera/hapi/util/UnknownHederaFunctionality.java b/hapi/src/main/java/com/hedera/hapi/util/UnknownHederaFunctionality.java index 1e789ee24877..03bd581a61ef 100644 --- a/hapi/src/main/java/com/hedera/hapi/util/UnknownHederaFunctionality.java +++ b/hapi/src/main/java/com/hedera/hapi/util/UnknownHederaFunctionality.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,8 +17,8 @@ package com.hedera.hapi.util; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.Query; +import com.hedera.hapi.node.transaction.TransactionBody; /** * Exception raised when mapping from {@link TransactionBody} or {@link Query} to {@link HederaFunctionality} diff --git a/hapi/src/testFixtures/java/com/hedera/node/hapi/fixtures/TransactionHelper.java b/hapi/src/testFixtures/java/com/hedera/node/hapi/fixtures/TransactionHelper.java index fb7744b905e9..1fe6b5635e40 100644 --- a/hapi/src/testFixtures/java/com/hedera/node/hapi/fixtures/TransactionHelper.java +++ b/hapi/src/testFixtures/java/com/hedera/node/hapi/fixtures/TransactionHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,6 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; -import com.hedera.hapi.node.base.TransactionBody.Builder; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusCreateTopicTransactionBody; import com.hedera.hapi.node.consensus.ConsensusGetTopicInfoQuery; @@ -33,6 +31,8 @@ import com.hedera.hapi.node.token.CryptoGetLiveHashQuery; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody.Builder; import com.hedera.hapi.node.transaction.UncheckedSubmitBody; import com.hedera.pbj.runtime.Codec; import com.hedera.pbj.runtime.io.buffer.Bytes; diff --git a/hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/CommonPbjConverters.java b/hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/CommonPbjConverters.java index 4ef4b192b410..46a1758ae679 100644 --- a/hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/CommonPbjConverters.java +++ b/hedera-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/CommonPbjConverters.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,6 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.scheduled.ScheduleInfo; import com.hedera.hapi.node.state.common.EntityNumber; @@ -46,6 +45,7 @@ import com.hedera.hapi.node.transaction.CustomFee; import com.hedera.hapi.node.transaction.ExchangeRate; import com.hedera.hapi.node.transaction.Query; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.pbj.runtime.Codec; import com.hedera.pbj.runtime.ParseException; diff --git a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeCreateHandler.java b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeCreateHandler.java index 64cdf658c759..ce83ac33e636 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeCreateHandler.java +++ b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeCreateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,8 +33,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.addressbook.Node; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.service.addressbook.impl.records.NodeCreateStreamBuilder; import com.hedera.node.app.service.addressbook.impl.validators.AddressBookValidator; diff --git a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeDeleteHandler.java b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeDeleteHandler.java index f20169a7cb67..1b204a9aa3ea 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeDeleteHandler.java +++ b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,8 +27,8 @@ import com.hedera.hapi.node.addressbook.NodeDeleteTransactionBody; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.addressbook.Node; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.spi.fees.FeeContext; diff --git a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeUpdateHandler.java b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeUpdateHandler.java index 8be3c43e979e..50d5e1fd59bf 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeUpdateHandler.java +++ b/hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/handlers/NodeUpdateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,8 +32,8 @@ import com.hedera.hapi.node.addressbook.NodeUpdateTransactionBody; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.addressbook.Node; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.service.addressbook.impl.validators.AddressBookValidator; diff --git a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeCreateHandlerTest.java b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeCreateHandlerTest.java index 8b37da1b3fb0..fe47a4dc9563 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeCreateHandlerTest.java +++ b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeCreateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,8 +43,8 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ServiceEndpoint; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.service.addressbook.impl.handlers.NodeCreateHandler; import com.hedera.node.app.service.addressbook.impl.records.NodeCreateStreamBuilder; diff --git a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeDeleteHandlerTest.java b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeDeleteHandlerTest.java index 44235539c72f..e942386a435d 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeDeleteHandlerTest.java +++ b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeDeleteHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.addressbook.Node; import com.hedera.hapi.node.state.common.EntityNumber; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.ReadableNodeStoreImpl; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; diff --git a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeUpdateHandlerTest.java b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeUpdateHandlerTest.java index c5fbdad4224e..aad684226d78 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeUpdateHandlerTest.java +++ b/hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/handlers/NodeUpdateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,8 +41,8 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ServiceEndpoint; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.WritableNodeStore; import com.hedera.node.app.service.addressbook.impl.handlers.NodeUpdateHandler; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java index ac45b56093a6..2712503cd48e 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package com.hedera.node.app.spi; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.signatures.SignatureVerifier; import com.hedera.node.app.spi.throttle.Throttle; import com.swirlds.common.crypto.Signature; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/authorization/Authorizer.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/authorization/Authorizer.java index c919e5aba6c8..e1fe93a47abf 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/authorization/Authorizer.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/authorization/Authorizer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/FeeContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/FeeContext.java index f75f7c6007a5..409c30dd4450 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/FeeContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/FeeContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package com.hedera.node.app.spi.fees; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.authorization.Authorizer; import com.swirlds.config.api.Configuration; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/store/StoreFactory.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/store/StoreFactory.java index 04c2275b8b96..644d4888b0cd 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/store/StoreFactory.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/store/StoreFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package com.hedera.node.app.spi.store; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/throttle/Throttle.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/throttle/Throttle.java index 57223e5669a0..0d50fa2e5aed 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/throttle/Throttle.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/throttle/Throttle.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.AppContext; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/DispatchOptions.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/DispatchOptions.java index 052b6f9b94a3..34977d66c1d1 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/DispatchOptions.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/DispatchOptions.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.workflows.HandleContext.ConsensusThrottling; import com.hedera.node.app.spi.workflows.HandleContext.TransactionCategory; import com.hedera.node.app.spi.workflows.record.StreamBuilder; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java index fdc0a43fb937..f0c95d1ff757 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.authorization.SystemPrivilege; import com.hedera.node.app.spi.fees.ExchangeRateInfo; import com.hedera.node.app.spi.fees.Fees; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/PreHandleContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/PreHandleContext.java index 28fe4175e5d3..1336dd697954 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/PreHandleContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/PreHandleContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ import com.hedera.hapi.node.base.ContractID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.pbj.runtime.io.buffer.Bytes; import com.swirlds.config.api.Configuration; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java index 37d058cffc2a..4f7488edb625 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package com.hedera.node.app.spi.workflows; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.swirlds.config.api.Configuration; import com.swirlds.state.lifecycle.info.NetworkInfo; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/TransactionHandler.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/TransactionHandler.java index 1b1e0a5afe67..78b862a60ed7 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/TransactionHandler.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/TransactionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2025 Hedera Hashgraph, LLC + * Copyright (C) 2020-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package com.hedera.node.app.spi.workflows; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/WarmupContext.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/WarmupContext.java index 980390ad1794..f85dfb75656c 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/WarmupContext.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/WarmupContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package com.hedera.node.app.spi.workflows; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/record/StreamBuilder.java b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/record/StreamBuilder.java index 6aed24944385..c2a1e4d1b027 100644 --- a/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/record/StreamBuilder.java +++ b/hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/record/StreamBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,10 +30,10 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.workflows.HandleContext; import com.hedera.pbj.runtime.io.buffer.Bytes; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TransactionFactory.java b/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TransactionFactory.java index f737080210fd..e14fa3c65b69 100644 --- a/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TransactionFactory.java +++ b/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TransactionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,10 +20,10 @@ import com.hedera.hapi.node.base.ContractID; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.pbj.runtime.Codec; import com.hedera.pbj.runtime.io.buffer.Bytes; import com.hedera.pbj.runtime.io.stream.WritableStreamingData; diff --git a/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/workflows/FakePreHandleContext.java b/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/workflows/FakePreHandleContext.java index 31a52a6873a8..1adaec3bedbb 100644 --- a/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/workflows/FakePreHandleContext.java +++ b/hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/workflows/FakePreHandleContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,9 +28,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.Key.KeyOneOfType; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.PreHandleContext; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java index 9ce4dc9cd975..22e4e95cd276 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java @@ -53,10 +53,10 @@ import com.hedera.hapi.block.stream.output.StateChanges; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SemanticVersion; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.blockrecords.BlockInfo; import com.hedera.hapi.node.state.blockstream.BlockStreamInfo; import com.hedera.hapi.node.transaction.ThrottleDefinitions; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.platform.event.StateSignatureTransaction; import com.hedera.hapi.platform.state.PlatformState; import com.hedera.hapi.util.HapiUtils; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/AuthorizerImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/AuthorizerImpl.java index 1f05921213d7..811943949cdc 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/AuthorizerImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/AuthorizerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.authorization.Authorizer; import com.hedera.node.app.spi.authorization.SystemPrivilege; import com.hedera.node.config.ConfigProvider; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/PrivilegesVerifier.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/PrivilegesVerifier.java index 09136554706c..5b4e4e38b433 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/PrivilegesVerifier.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/PrivilegesVerifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,10 +24,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.file.SystemDeleteTransactionBody; import com.hedera.hapi.node.file.SystemUndeleteTransactionBody; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.authorization.SystemPrivilege; import com.hedera.node.config.ConfigProvider; import com.hedera.node.config.data.AccountsConfig; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamBuilder.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamBuilder.java index 4731f6df93ac..048d9b47b409 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamBuilder.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,6 @@ import com.hedera.hapi.node.base.TokenType; import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; @@ -61,6 +60,7 @@ import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.PendingAirdropRecord; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.transaction.TransactionReceipt; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.platform.event.EventTransaction; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/PairedStreamBuilder.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/PairedStreamBuilder.java index 0ff225e2cb5a..79a80297ac55 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/PairedStreamBuilder.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/PairedStreamBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,13 +30,13 @@ import com.hedera.hapi.node.base.TokenType; import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.AssessedCustomFee; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.PendingAirdropRecord; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.streams.ContractActions; import com.hedera.hapi.streams.ContractBytecode; import com.hedera.hapi.streams.ContractStateChanges; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/ChildFeeContextImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/ChildFeeContextImpl.java index ddb02f4e091c..560132398f49 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/ChildFeeContextImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/ChildFeeContextImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.spi.authorization.Authorizer; import com.hedera.node.app.spi.fees.FeeCalculator; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeCalculatorImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeCalculatorImpl.java index 89818e65f6de..858ea23c5a1e 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeCalculatorImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeCalculatorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,11 +30,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.ExchangeRate; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.hapi.fees.calc.OverflowCheckingCalc; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeContextImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeContextImpl.java index 1ba7900554ad..4a86e8c4fd41 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeContextImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeContextImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.authorization.Authorizer; import com.hedera.node.app.spi.fees.FeeCalculator; import com.hedera.node.app.spi.fees.FeeCalculatorFactory; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeManager.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeManager.java index 189abc1a88cc..2adfb323d44e 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeManager.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,8 +33,8 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionFeeSchedule; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.spi.fees.FeeCalculator; import com.hedera.node.app.store.ReadableStoreFactory; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/CongestionMultipliers.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/CongestionMultipliers.java index 3dad83e3469f..a809acfd363b 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/CongestionMultipliers.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/CongestionMultipliers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.store.ReadableStoreFactory; import com.hedera.node.app.throttle.annotations.GasThrottleMultiplier; import com.hedera.node.app.workflows.TransactionInfo; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplier.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplier.java index e1b754a6105b..227e6eabe381 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplier.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.contract.impl.state.ContractStateStore; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/ServiceScopeLookup.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/ServiceScopeLookup.java index c7c069d3dd52..d49ccd596af5 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/ServiceScopeLookup.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/ServiceScopeLookup.java @@ -16,7 +16,7 @@ package com.hedera.node.app.services; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.addressbook.AddressBookService; import com.hedera.node.app.service.consensus.ConsensusService; import com.hedera.node.app.service.contract.ContractService; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/logging/TransactionStateLogger.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/logging/TransactionStateLogger.java index eb8f216e5b15..dadadd25ef77 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/logging/TransactionStateLogger.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/logging/TransactionStateLogger.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TopicID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.node.app.workflows.prehandle.PreHandleResult; import com.swirlds.platform.system.Round; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/AppThrottleFactory.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/AppThrottleFactory.java index 6b00656ea630..4ca258a377f5 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/AppThrottleFactory.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/AppThrottleFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,10 +22,10 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; import com.hedera.hapi.node.transaction.ThrottleDefinitions; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; import com.hedera.node.app.spi.throttle.Throttle; import com.hedera.node.app.workflows.TransactionInfo; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/NetworkUtilizationManagerImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/NetworkUtilizationManagerImpl.java index 87397d4e469b..3f4e6870f566 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/NetworkUtilizationManagerImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/NetworkUtilizationManagerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.throttle.annotations.BackendThrottle; import com.hedera.node.app.workflows.TransactionInfo; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleAccumulator.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleAccumulator.java index 0e574e5cae11..f2065b758847 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleAccumulator.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleAccumulator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,6 @@ import com.hedera.hapi.node.base.NftTransfer; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractCallLocalQuery; @@ -52,6 +51,7 @@ import com.hedera.hapi.node.token.TokenMintTransactionBody; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.ThrottleDefinitions; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.hapi.utils.sysfiles.domain.throttling.ThrottleBucket; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleServiceManager.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleServiceManager.java index 266f8a24731f..fe4365cd9694 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleServiceManager.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleServiceManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,11 +25,11 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.congestion.CongestionLevelStarts; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshot; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; import com.hedera.hapi.node.transaction.ThrottleDefinitions; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/SolvencyPreCheck.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/SolvencyPreCheck.java index bb0f32548fd2..e38108936c6a 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/SolvencyPreCheck.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/SolvencyPreCheck.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,8 +33,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java index 69ee47d9682f..56fd293a2bd8 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionChecker.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,9 +39,9 @@ import com.hedera.hapi.node.base.SignaturePair; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.annotations.MaxSignedTxnSize; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java index 646cffa8d670..433932867c7c 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/TransactionInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.pbj.runtime.io.buffer.Bytes; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java index 61748942ce96..30d8901729a2 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java @@ -19,7 +19,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/DispatchHandleContext.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/DispatchHandleContext.java index 069148e00bb4..2e8920926785 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/DispatchHandleContext.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/DispatchHandleContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,8 +29,8 @@ import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ChildFeeContextImpl; import com.hedera.node.app.fees.ExchangeRateManager; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/cache/CacheWarmer.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/cache/CacheWarmer.java index 9fa3f671f073..8540963d4747 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/cache/CacheWarmer.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/cache/CacheWarmer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.TransactionHandler; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactory.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactory.java index 07193999de59..cf473a84276c 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactory.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,10 +37,10 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeAccumulator; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizer.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizer.java index 53e67a94ed39..6797428908f3 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizer.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,8 @@ import com.hedera.hapi.node.base.AccountAmount; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransferList; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.FinalizeRecordHandler; import com.hedera.node.app.spi.workflows.record.StreamBuilder; import com.hedera.node.app.workflows.handle.Dispatch; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/RecordStreamBuilder.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/RecordStreamBuilder.java index ac5bda8aacab..c97600b4dd3e 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/RecordStreamBuilder.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/RecordStreamBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,6 @@ import com.hedera.hapi.node.base.TokenType; import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; @@ -45,6 +44,7 @@ import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.PendingAirdropRecord; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.transaction.TransactionReceipt; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.streams.ContractActions; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/SystemSetup.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/SystemSetup.java index 90d07bbe62a8..ec0320db7b9e 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/SystemSetup.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/SystemSetup.java @@ -37,13 +37,13 @@ import com.hedera.hapi.node.base.Duration; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.transaction.ExchangeRateSet; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.ids.EntityIdService; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.addressbook.impl.schemas.V053AddressBookSchema; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletions.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletions.java index df1874c143fc..f018ef5c9827 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletions.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletions.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,9 +24,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.handlers.EthereumTransactionHandler; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdates.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdates.java index 7d1f3cb1ce29..699cc0be2983 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdates.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdates.java @@ -21,10 +21,10 @@ import static java.util.Spliterator.DISTINCT; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.roster.Roster; import com.hedera.hapi.node.state.roster.RosterEntry; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.roster.RosterService; import com.hedera.node.app.service.addressbook.AddressBookService; import com.hedera.node.app.service.addressbook.impl.ReadableNodeStoreImpl; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdates.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdates.java index 1f802f25c826..04f33a455081 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdates.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdates.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ServicesConfigurationList; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.config.ConfigProviderImpl; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/UserTxnFactory.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/UserTxnFactory.java index 60af363401a5..1d87d8db27f1 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/UserTxnFactory.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/steps/UserTxnFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,8 +32,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.ExchangeRateSet; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.blocks.BlockStreamManager; import com.hedera.node.app.blocks.impl.BoundaryStateChangeListener; import com.hedera.node.app.blocks.impl.KVStateChangeListener; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManager.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManager.java index 98c25c79e65a..5f5262686b8a 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManager.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,10 +30,10 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; import com.hedera.node.app.throttle.CongestionThrottleService; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/ingest/SubmissionManager.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/ingest/SubmissionManager.java index cb28478324e5..b18b36f038f5 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/ingest/SubmissionManager.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/ingest/SubmissionManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import static com.hedera.hapi.node.base.ResponseCodeEnum.PLATFORM_TRANSACTION_NOT_CREATED; import static java.util.Objects.requireNonNull; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.state.DeduplicationCache; import com.hedera.node.config.ConfigProvider; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImpl.java index f064716dc5b2..b568236e4d89 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,9 +30,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.Key.KeyOneOfType; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.PreHandleContext; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleWorkflowImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleWorkflowImpl.java index 849c518a9733..4ea6daa459d3 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleWorkflowImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/prehandle/PreHandleWorkflowImpl.java @@ -31,8 +31,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignaturePair; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.platform.event.StateSignatureTransaction; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.signature.ExpandedSignaturePair; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/query/QueryWorkflowImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/query/QueryWorkflowImpl.java index 16a83e83e1e6..cc4edf0ecdc4 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/query/QueryWorkflowImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/query/QueryWorkflowImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,9 +34,9 @@ import com.hedera.hapi.node.base.ResponseHeader; import com.hedera.hapi.node.base.ResponseType; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.Response; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ExchangeRateManager; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutor.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutor.java index af2520a5142f..32a7a0d7fba1 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutor.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package com.hedera.node.app.workflows.standalone; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.state.SingleTransactionRecord; import com.swirlds.state.State; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneDispatchFactory.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneDispatchFactory.java index cb0453b5572e..2edeb53e8815 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneDispatchFactory.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneDispatchFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,8 +27,8 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.platform.event.EventTransaction; import com.hedera.node.app.blocks.impl.BoundaryStateChangeListener; import com.hedera.node.app.blocks.impl.KVStateChangeListener; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/authorization/PrivilegesVerifierTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/authorization/PrivilegesVerifierTest.java index ba56700764e4..c3d7d910419b 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/authorization/PrivilegesVerifierTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/authorization/PrivilegesVerifierTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,7 +65,7 @@ class PrivilegesVerifierTest { private record TestCase( com.hedera.hapi.node.base.AccountID payerId, com.hedera.hapi.node.base.HederaFunctionality function, - com.hedera.hapi.node.base.TransactionBody txn) { + com.hedera.hapi.node.transaction.TransactionBody txn) { public TestCase withPayerId(com.hedera.hapi.node.base.AccountID newPayerId) { return new TestCase(newPayerId, function, txn); } @@ -90,12 +90,12 @@ boolean canPerformNonCryptoUpdate(final long accountNum, final long fileNum) { final var fileID = com.hedera.hapi.node.base.FileID.newBuilder() .fileNum(fileNum) .build(); - final var fileUpdateTxBody = com.hedera.hapi.node.base.TransactionBody.newBuilder() + final var fileUpdateTxBody = com.hedera.hapi.node.transaction.TransactionBody.newBuilder() .fileUpdate(com.hedera.hapi.node.file.FileUpdateTransactionBody.newBuilder() .fileID(fileID) .build()) .build(); - final var fileAppendTxBody = com.hedera.hapi.node.base.TransactionBody.newBuilder() + final var fileAppendTxBody = com.hedera.hapi.node.transaction.TransactionBody.newBuilder() .fileAppend(com.hedera.hapi.node.file.FileAppendTransactionBody.newBuilder() .fileID(fileID) .build()) diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java index 6e3c6a06ba23..341fb53911b9 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/blocks/BlockStreamBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,13 +33,13 @@ import com.hedera.hapi.node.base.TokenAssociation; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.AssessedCustomFee; import com.hedera.hapi.node.transaction.ExchangeRateSet; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.streams.ContractStateChanges; import com.hedera.node.app.blocks.impl.BlockStreamBuilder; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/ChildFeeContextImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/ChildFeeContextImplTest.java index dd0ffebed836..b2f053aa01c5 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/ChildFeeContextImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/ChildFeeContextImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,8 +29,8 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.authorization.Authorizer; import com.hedera.node.app.spi.fees.FeeCalculator; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/FeeCalculatorImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/FeeCalculatorImplTest.java index ff198a3aca9b..71b9b1b37ffb 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/FeeCalculatorImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/FeeCalculatorImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,8 +24,8 @@ import static org.mockito.Mockito.verify; import com.hedera.hapi.node.base.*; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.ExchangeRate; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.fixtures.state.FakeState; import com.hedera.node.app.store.ReadableStoreFactory; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplierTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplierTest.java index 0a88f9af28f8..add2fca2116d 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplierTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/fees/congestion/UtilizationScaledThrottleMultiplierTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,6 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TopicID; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.common.EntityIDPair; import com.hedera.hapi.node.state.common.EntityNumber; @@ -50,6 +49,7 @@ import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenMintTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.fixtures.state.FakeState; import com.hedera.node.app.service.consensus.ConsensusService; import com.hedera.node.app.service.consensus.impl.ConsensusServiceImpl; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleAdviserTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleAdviserTest.java index c7d179fb771c..c7b8ec6677bd 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleAdviserTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleAdviserTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,10 +23,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.workflows.TransactionInfo; import com.hedera.node.app.workflows.handle.record.RecordStreamBuilder; import com.hedera.node.app.workflows.handle.stack.SavepointStackImpl; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleFactoryTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleFactoryTest.java index 448fdb9d5603..e0000a5a30e8 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleFactoryTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/AppThrottleFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,12 +29,12 @@ import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshot; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.ThrottleDefinitions; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; import com.hedera.node.app.hapi.utils.throttles.GasLimitDeterministicThrottle; import com.hedera.node.app.workflows.TransactionInfo; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java index cafaa5033ec5..a69ebaf820cb 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/ThrottleAccumulatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,6 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.ContractCallTransactionBody; @@ -67,6 +66,7 @@ import com.hedera.hapi.node.token.TokenMintTransactionBody; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.ThrottleDefinitions; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.sysfiles.domain.throttling.ScaleFactor; import com.hedera.node.app.hapi.utils.throttles.BucketThrottle; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/impl/NetworkUtilizationManagerImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/impl/NetworkUtilizationManagerImplTest.java index 3d2c18f603d2..98a584cad828 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/impl/NetworkUtilizationManagerImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/throttle/impl/NetworkUtilizationManagerImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.fees.congestion.CongestionMultipliers; import com.hedera.node.app.hapi.utils.throttles.DeterministicThrottle; import com.hedera.node.app.hapi.utils.throttles.GasLimitDeterministicThrottle; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/SolvencyPreCheckTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/SolvencyPreCheckTest.java index 447d13473fb9..81030930c343 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/SolvencyPreCheckTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/SolvencyPreCheckTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,13 +37,13 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.contract.EthereumTransactionBody; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java index 54d2ec3a1b9f..3cfbf371c59f 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionCheckerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,10 +46,10 @@ import com.hedera.hapi.node.base.SignaturePair; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusCreateTopicTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.util.HapiUtils; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fixtures.AppTestBase; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java index e0e1eb73f22e..aa9e897edaf5 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/TransactionScenarioBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,11 +25,11 @@ import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.fixtures.Scenarios; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java index 0e1bb82cbf39..70ff7adeec05 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchHandleContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,12 +63,12 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusSubmitMessageTransactionBody; import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ChildFeeContextImpl; import com.hedera.node.app.fees.ExchangeRateManager; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchProcessorTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchProcessorTest.java index 55fc7ed3d972..1e360bb0a73b 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchProcessorTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/DispatchProcessorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,10 +55,10 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.transaction.ExchangeRateSet; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeAccumulator; import com.hedera.node.app.service.contract.impl.handlers.EthereumTransactionHandler; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactoryTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactoryTest.java index d6c1b021b61a..373cbf4daacc 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactoryTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ChildDispatchFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,9 +33,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.ThresholdKey; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java index 3f0339dbbb02..8433a9f0f139 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/RecordFinalizerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,9 +38,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.FinalizeRecordHandler; import com.hedera.node.app.service.token.records.FinalizeContext; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ValidationReporterTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ValidationReporterTest.java index 83e039f6a377..ffb37751b6be 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ValidationReporterTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/dispatch/ValidationReporterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,9 +48,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.signature.AppKeyVerifier; import com.hedera.node.app.signature.impl.SignatureVerificationImpl; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/record/RecordTestData.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/record/RecordTestData.java index 0b11838876c3..e48ba6ce9f09 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/record/RecordTestData.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/record/RecordTestData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TokenType; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.transaction.TransactionRecord; import com.hedera.hapi.streams.HashAlgorithm; import com.hedera.hapi.streams.HashObject; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java index b397f831477c..f7d049c16412 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,12 +34,12 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.EthereumTransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxSigs; import com.hedera.node.app.service.contract.impl.handlers.EthereumTransactionHandler; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java index 768be96298c3..6879ed150fbb 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/PlatformStateUpdatesTest.java @@ -38,7 +38,6 @@ import com.hedera.hapi.node.base.ServiceEndpoint; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.freeze.FreezeTransactionBody; import com.hedera.hapi.node.state.addressbook.Node; import com.hedera.hapi.node.state.common.EntityNumber; @@ -48,6 +47,7 @@ import com.hedera.hapi.node.state.roster.RoundRosterPair; import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.platform.state.PlatformState; import com.hedera.node.app.fixtures.state.FakeState; import com.hedera.node.app.roster.RosterService; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java index 7d41cc548d44..6eaa0e86074d 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/SystemFileUpdatesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,12 +26,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.FileID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.FileAppendTransactionBody; import com.hedera.hapi.node.file.FileUpdateTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.config.ConfigProviderImpl; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/UserTxnTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/UserTxnTest.java index 5e10ced2cf29..d17cf93e1b2c 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/UserTxnTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/UserTxnTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.transaction.ExchangeRateSet; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.platform.event.EventTransaction; import com.hedera.node.app.blocks.BlockStreamManager; import com.hedera.node.app.blocks.impl.BlockStreamBuilder; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManagerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManagerTest.java index 555100742cd9..8ae80416e730 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManagerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/throttle/DispatchUsageManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,11 +41,11 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestCheckerTest.java index 4fdaba822635..a287e74111e1 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestCheckerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,10 +54,10 @@ import com.hedera.hapi.node.base.ThresholdKey; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.transaction.UncheckedSubmitBody; import com.hedera.node.app.fees.FeeManager; import com.hedera.node.app.fixtures.AppTestBase; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java index 60e32c980460..f49f31cccede 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/IngestWorkflowImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,8 +40,8 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.transaction.TransactionResponse; import com.hedera.node.app.fixtures.AppTestBase; import com.hedera.node.app.spi.workflows.PreCheckException; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/SubmissionManagerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/SubmissionManagerTest.java index 9e7c0f354d19..2c7cc66c5d31 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/SubmissionManagerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/SubmissionManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,8 +24,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.transaction.UncheckedSubmitBody; import com.hedera.node.app.fixtures.AppTestBase; import com.hedera.node.app.spi.workflows.PreCheckException; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImplTest.java index c3e6974aa92b..eba0292e00b3 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.ThresholdKey; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.fixtures.Scenarios; import com.hedera.node.app.spi.workflows.PreCheckException; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextListUpdatesTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextListUpdatesTest.java index 61fd7983483e..015ae6cfed6e 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextListUpdatesTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/prehandle/PreHandleContextListUpdatesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.ThresholdKey; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.node.app.spi.workflows.PreHandleContext; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryCheckerTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryCheckerTest.java index 9d5f9e525ea9..27acf862ffcc 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryCheckerTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryCheckerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,12 +41,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.fees.FeeManager; import com.hedera.node.app.fixtures.AppTestBase; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryWorkflowImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryWorkflowImplTest.java index 334a08b76356..dd4fbd5f21bc 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryWorkflowImplTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/query/QueryWorkflowImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,6 @@ import com.hedera.hapi.node.base.ResponseType; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.FileGetInfoQuery; import com.hedera.hapi.node.file.FileGetInfoResponse; @@ -58,6 +57,7 @@ import com.hedera.hapi.node.network.NetworkGetExecutionTimeResponse; import com.hedera.hapi.node.transaction.Query; import com.hedera.hapi.node.transaction.Response; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.fees.ExchangeRateManager; import com.hedera.node.app.fees.FeeManager; import com.hedera.node.app.fixtures.AppTestBase; diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/standalone/TransactionExecutorsTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/standalone/TransactionExecutorsTest.java index 1083ce2457e5..5b3c3264546d 100644 --- a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/standalone/TransactionExecutorsTest.java +++ b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/standalone/TransactionExecutorsTest.java @@ -36,7 +36,6 @@ import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.ServiceEndpoint; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; @@ -44,6 +43,7 @@ import com.hedera.hapi.node.state.blockrecords.BlockInfo; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.transaction.ThrottleDefinitions; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.config.BootstrapConfigProviderImpl; import com.hedera.node.app.config.ConfigProviderImpl; import com.hedera.node.app.fees.FeeService; diff --git a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusCreateTopicHandler.java b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusCreateTopicHandler.java index c5e46942be56..09245289ccf2 100644 --- a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusCreateTopicHandler.java +++ b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusCreateTopicHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,8 +32,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TopicID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.consensus.Topic; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusDeleteTopicHandler.java b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusDeleteTopicHandler.java index ac8cd03736ed..4990cfe14d2c 100644 --- a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusDeleteTopicHandler.java +++ b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusDeleteTopicHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,9 +25,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TopicID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.consensus.ConsensusDeleteTopicTransactionBody; import com.hedera.hapi.node.state.consensus.Topic; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.ConsensusServiceFeeBuilder; import com.hedera.node.app.hapi.utils.fee.SigValueObj; diff --git a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusSubmitMessageHandler.java b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusSubmitMessageHandler.java index bf72bf9fb558..22a855b4f494 100644 --- a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusSubmitMessageHandler.java +++ b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusSubmitMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TopicID; -import com.hedera.hapi.node.base.TransactionBody; 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.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusUpdateTopicHandler.java b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusUpdateTopicHandler.java index 1170a4af54bc..da1364631903 100644 --- a/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusUpdateTopicHandler.java +++ b/hedera-node/hedera-consensus-service-impl/src/main/java/com/hedera/node/app/service/consensus/impl/handlers/ConsensusUpdateTopicHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,9 +39,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TopicID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.consensus.ConsensusUpdateTopicTransactionBody; import com.hedera.hapi.node.state.consensus.Topic; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.service.consensus.ReadableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusCreateTopicTest.java b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusCreateTopicTest.java index 939f4fcd755e..c4bc746a4f4f 100644 --- a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusCreateTopicTest.java +++ b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusCreateTopicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,11 +38,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TopicID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusCreateTopicTransactionBody; import com.hedera.hapi.node.state.consensus.Topic; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; import com.hedera.node.app.service.consensus.impl.handlers.ConsensusCreateTopicHandler; import com.hedera.node.app.service.consensus.impl.records.ConsensusCreateTopicStreamBuilder; diff --git a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusDeleteTopicTest.java b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusDeleteTopicTest.java index fd3492510885..205c9dc94405 100644 --- a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusDeleteTopicTest.java +++ b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusDeleteTopicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TopicID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusDeleteTopicTransactionBody; import com.hedera.hapi.node.state.consensus.Topic; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.consensus.impl.ReadableTopicStoreImpl; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusSubmitMessageHandlerTest.java b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusSubmitMessageHandlerTest.java index 756ef41bd13f..e5889f5b7f48 100644 --- a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusSubmitMessageHandlerTest.java +++ b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusSubmitMessageHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,11 +40,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TopicID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; 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.TransactionBody; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.consensus.impl.ReadableTopicStoreImpl; import com.hedera.node.app.service.consensus.impl.WritableTopicStore; diff --git a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusUpdateTopicHandlerTest.java b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusUpdateTopicHandlerTest.java index 970b0b2a12e1..a24d80e55d46 100644 --- a/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusUpdateTopicHandlerTest.java +++ b/hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/ConsensusUpdateTopicHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,10 +42,10 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TopicID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusUpdateTopicTransactionBody; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.consensus.ReadableTopicStore; import com.hedera.node.app.service.consensus.impl.handlers.ConsensusUpdateTopicHandler; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileAppendHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileAppendHandler.java index 8b80c12330f3..bc56669bf166 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileAppendHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileAppendHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,9 +29,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.file.FileAppendTransactionBody; import com.hedera.hapi.node.state.file.File; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.file.FileSignatureWaivers; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileCreateHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileCreateHandler.java index 6aa65da348a9..0a93bee426c2 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileCreateHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileCreateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,9 +28,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.file.FileCreateTransactionBody; import com.hedera.hapi.node.state.file.File; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.file.FileOpsUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileDeleteHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileDeleteHandler.java index 6d55ce94a0c3..810aa1279a6e 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileDeleteHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.file.FileDeleteTransactionBody; import com.hedera.hapi.node.state.file.File; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSignatureWaiversImpl.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSignatureWaiversImpl.java index 0e14778bf8b5..b781dd6ba0fc 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSignatureWaiversImpl.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSignatureWaiversImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2025 Hedera Hashgraph, LLC + * Copyright (C) 2020-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.file.FileSignatureWaivers; import com.hedera.node.app.spi.authorization.Authorizer; import com.hedera.node.app.spi.authorization.SystemPrivilege; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemDeleteHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemDeleteHandler.java index 7a71c2b1a289..a42887297f42 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemDeleteHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,8 +24,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TimestampSeconds; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.file.File; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemUndeleteHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemUndeleteHandler.java index e028a038354f..1b7a548365fa 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemUndeleteHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileSystemUndeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.file.File; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileUpdateHandler.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileUpdateHandler.java index b6efe2db1f6a..5ecbf7980f56 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileUpdateHandler.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/handlers/FileUpdateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.file.FileUpdateTransactionBody; import com.hedera.hapi.node.state.file.File; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.file.ExtantFileContext; import com.hedera.node.app.hapi.fees.usage.file.FileOpsUsage; diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/V0490FileSchema.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/V0490FileSchema.java index 35a5a45b4a5f..b0cdd7bdc6d7 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/V0490FileSchema.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/V0490FileSchema.java @@ -39,7 +39,6 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TimestampSeconds; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionFeeSchedule; import com.hedera.hapi.node.file.FileCreateTransactionBody; import com.hedera.hapi.node.file.FileUpdateTransactionBody; @@ -50,6 +49,7 @@ import com.hedera.hapi.node.transaction.ExchangeRate; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.ThrottleDefinitions; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.spi.workflows.SystemContext; import com.hedera.node.config.ConfigProvider; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileAppendHandlerTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileAppendHandlerTest.java index 00765f88e414..eabf035e71ae 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileAppendHandlerTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileAppendHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,12 +35,12 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.FileAppendTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.primitives.ProtoBytes; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.WritableFileStore; import com.hedera.node.app.service.file.impl.WritableUpgradeFileStore; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileCreateTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileCreateTest.java index 17c276110a65..20203ac9d339 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileCreateTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileCreateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,11 +40,11 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ShardID; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.FileCreateTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.file.FileOpsUsage; import com.hedera.node.app.service.file.impl.WritableFileStore; import com.hedera.node.app.service.file.impl.handlers.FileCreateHandler; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileDeleteTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileDeleteTest.java index 4df3b1d35fa4..eb284d5f22f8 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileDeleteTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileDeleteTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,11 +35,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.FileDeleteTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.ReadableFileStoreImpl; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSignatureWaiversImplTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSignatureWaiversImplTest.java index 355eb3d0f6cf..64599f490d05 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSignatureWaiversImplTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSignatureWaiversImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.file.impl.handlers.FileSignatureWaiversImpl; import com.hedera.node.app.spi.authorization.Authorizer; import com.hedera.node.app.spi.authorization.SystemPrivilege; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemDeleteTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemDeleteTest.java index 3db32d5976bd..cf6eb7d8cf91 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemDeleteTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemDeleteTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.SystemDeleteTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.ReadableFileStoreImpl; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemUndeleteTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemUndeleteTest.java index 2983ad7ba5a6..5ea4e57fae61 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemUndeleteTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileSystemUndeleteTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.SystemUndeleteTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.fee.FileFeeBuilder; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.ReadableFileStoreImpl; diff --git a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileUpdateTest.java b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileUpdateTest.java index 0bfe2530f69e..e21ed0da70ae 100644 --- a/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileUpdateTest.java +++ b/hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileUpdateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,11 +35,11 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.file.FileUpdateTransactionBody; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.file.FileOpsUsage; import com.hedera.node.app.service.file.ReadableFileStore; import com.hedera.node.app.service.file.impl.WritableFileStore; diff --git a/hedera-node/hedera-file-service/src/main/java/com/hedera/node/app/service/file/FileSignatureWaivers.java b/hedera-node/hedera-file-service/src/main/java/com/hedera/node/app/service/file/FileSignatureWaivers.java index 124894f5fed9..9eab2ce9980a 100644 --- a/hedera-node/hedera-file-service/src/main/java/com/hedera/node/app/service/file/FileSignatureWaivers.java +++ b/hedera-node/hedera-file-service/src/main/java/com/hedera/node/app/service/file/FileSignatureWaivers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2025 Hedera Hashgraph, LLC + * Copyright (C) 2021-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package com.hedera.node.app.service.file; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.SigWaivers; /** diff --git a/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/FreezeHandler.java b/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/FreezeHandler.java index 6388930f882e..3b8e154e7391 100644 --- a/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/FreezeHandler.java +++ b/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/FreezeHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,9 +27,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.freeze.FreezeTransactionBody; import com.hedera.hapi.node.freeze.FreezeType; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.file.ReadableUpgradeFileStore; import com.hedera.node.app.service.networkadmin.ReadableFreezeStore; diff --git a/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/NetworkUncheckedSubmitHandler.java b/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/NetworkUncheckedSubmitHandler.java index e454677f43f2..22c10626e6a9 100644 --- a/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/NetworkUncheckedSubmitHandler.java +++ b/hedera-node/hedera-network-admin-service-impl/src/main/java/com/hedera/node/app/service/networkadmin/impl/handlers/NetworkUncheckedSubmitHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-network-admin-service-impl/src/test/java/com/hedera/node/app/service/networkadmin/impl/test/handlers/FreezeHandlerTest.java b/hedera-node/hedera-network-admin-service-impl/src/test/java/com/hedera/node/app/service/networkadmin/impl/test/handlers/FreezeHandlerTest.java index 8816f4047baf..ce52d8bc7049 100644 --- a/hedera-node/hedera-network-admin-service-impl/src/test/java/com/hedera/node/app/service/networkadmin/impl/test/handlers/FreezeHandlerTest.java +++ b/hedera-node/hedera-network-admin-service-impl/src/test/java/com/hedera/node/app/service/networkadmin/impl/test/handlers/FreezeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,13 +39,13 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.freeze.FreezeTransactionBody; import com.hedera.hapi.node.freeze.FreezeType; import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.file.File; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.addressbook.ReadableNodeStore; import com.hedera.node.app.service.file.ReadableUpgradeFileStore; import com.hedera.node.app.service.networkadmin.impl.WritableFreezeStore; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java index 4adec5cfc9e8..1fc81ffe9942 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,8 +37,8 @@ import com.hedera.hapi.node.base.Key.KeyOneOfType; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ScheduleID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.schedule.ReadableScheduleStore; import com.hedera.node.app.service.schedule.ScheduleStreamBuilder; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java index db14cd41694f..9615a5689602 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java @@ -22,10 +22,10 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody.DataOneOfType; import com.hedera.hapi.node.state.schedule.Schedule; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.workflows.HandleException; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java index 8260edd2d705..16512ce547f1 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java @@ -44,12 +44,12 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ScheduleID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.scheduled.ScheduleCreateTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; import com.hedera.hapi.node.state.schedule.ScheduledOrder; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.schedule.ScheduleOpsUsage; import com.hedera.node.app.hapi.utils.fee.SigValueObj; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandler.java index 1115fc1920bd..ea4dfa3e504e 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandler.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,9 +31,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.ScheduleDeleteTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.schedule.ScheduleOpsUsage; import com.hedera.node.app.hapi.utils.fee.SigValueObj; diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandler.java index 13bde4bba797..5839bba11a4e 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandler.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,9 +28,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.ScheduleSignTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.schedule.ScheduleOpsUsage; import com.hedera.node.app.hapi.utils.fee.SigValueObj; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduleTestBase.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduleTestBase.java index 0d5205767451..fb6245892554 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduleTestBase.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduleTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,6 @@ import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TimestampSeconds; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.consensus.ConsensusCreateTopicTransactionBody; import com.hedera.hapi.node.consensus.ConsensusDeleteTopicTransactionBody; @@ -79,6 +78,7 @@ import com.hedera.hapi.node.token.TokenUnpauseTransactionBody; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; import com.hedera.hapi.node.token.TokenWipeAccountTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.util.UtilPrngTransactionBody; import com.hedera.node.app.service.schedule.ReadableScheduleStore; import com.hedera.node.app.service.schedule.WritableScheduleStore; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduledTransactionFactory.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduledTransactionFactory.java index 14a0d0d3595f..2cc2b8d888b8 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduledTransactionFactory.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/ScheduledTransactionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,12 +20,12 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.scheduled.ScheduleCreateTransactionBody; import com.hedera.hapi.node.scheduled.ScheduleCreateTransactionBody.Builder; import com.hedera.hapi.node.token.TokenBurnTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import edu.umd.cs.findbugs.annotations.NonNull; public final class ScheduledTransactionFactory { diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtilityTest.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtilityTest.java index 3f100887a784..6f4bff5e65a3 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtilityTest.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtilityTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,10 +20,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody.DataOneOfType; import com.hedera.hapi.node.state.schedule.Schedule; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.workflows.PreCheckException; import edu.umd.cs.findbugs.annotations.Nullable; import java.security.InvalidKeyException; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandlerTest.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandlerTest.java index 836261ad134f..1eab31290203 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandlerTest.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,12 +31,12 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody.DataOneOfType; import com.hedera.hapi.node.state.schedule.Schedule; import com.hedera.hapi.node.state.throttles.ThrottleUsageSnapshots; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.schedule.WritableScheduleStore; import com.hedera.node.app.service.schedule.impl.ScheduledTransactionFactory; import com.hedera.node.app.signature.impl.SignatureVerificationImpl; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandlerTest.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandlerTest.java index 9440e7eb5eb7..a96cb4244b90 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandlerTest.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleDeleteHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,10 +24,10 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ScheduleID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.ScheduleDeleteTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.signature.impl.SignatureVerificationImpl; import com.hedera.node.app.spi.fixtures.Assertions; import com.hedera.node.app.spi.signatures.VerificationAssistant; diff --git a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandlerTest.java b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandlerTest.java index 0e672e5fc35d..386d55af66e6 100644 --- a/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandlerTest.java +++ b/hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleSignHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,10 +22,10 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.ScheduleID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.ScheduleSignTransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.fixtures.Assertions; import com.hedera.node.app.spi.key.KeyComparator; import com.hedera.node.app.spi.signatures.VerificationAssistant; diff --git a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ExecutableTxn.java b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ExecutableTxn.java index 69f51316f278..f23701a735fd 100644 --- a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ExecutableTxn.java +++ b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ExecutableTxn.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.workflows.record.StreamBuilder; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Instant; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/DispatchGasCalculator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/DispatchGasCalculator.java index c2ced66678a5..bf3d8638f879 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/DispatchGasCalculator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/DispatchGasCalculator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package com.hedera.node.app.service.contract.impl.exec.gas; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.hevm.HederaWorldUpdater.Enhancement; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/SystemContractGasCalculator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/SystemContractGasCalculator.java index 11fdf051f3cc..a14475a5b40e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/SystemContractGasCalculator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/SystemContractGasCalculator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.function.ToLongBiFunction; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaNativeOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaNativeOperations.java index 500e5ac627ab..697b53cff698 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaNativeOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaNativeOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.annotations.TransactionScope; import com.hedera.node.app.service.schedule.ReadableScheduleStore; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaOperations.java index 901c613cc34a..8b47680ccf4f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleHederaOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ import com.hedera.hapi.node.base.Duration; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.annotations.TransactionScope; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.TinybarValues; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleSystemContractOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleSystemContractOperations.java index 6f9b35d0d5b7..44408067bfee 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleSystemContractOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleSystemContractOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,11 +28,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.ExchangeRate; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.annotations.TransactionScope; import com.hedera.node.app.service.contract.impl.records.ContractCallStreamBuilder; import com.hedera.node.app.spi.workflows.DispatchOptions.StakingRewards; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/QuerySystemContractOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/QuerySystemContractOperations.java index b1174e22bc54..4de48d3ed628 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/QuerySystemContractOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/QuerySystemContractOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,9 +24,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.ExchangeRate; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.annotations.QueryScope; import com.hedera.node.app.service.contract.impl.records.ContractCallStreamBuilder; import com.hedera.node.app.spi.workflows.DispatchOptions.UsePresetTxnId; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/SystemContractOperations.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/SystemContractOperations.java index 190482417b99..a962f0dc0c58 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/SystemContractOperations.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/SystemContractOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,9 +24,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.ExchangeRate; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.records.ContractCallStreamBuilder; import com.hedera.node.app.spi.workflows.DispatchOptions.UsePresetTxnId; import com.hedera.node.app.spi.workflows.record.StreamBuilder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/PrngSystemContract.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/PrngSystemContract.java index af24bb8cb563..b6421a1af759 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/PrngSystemContract.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/PrngSystemContract.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,8 +29,8 @@ import static org.hyperledger.besu.evm.frame.ExceptionalHaltReason.INVALID_OPERATION; import com.hedera.hapi.node.base.ContractID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.util.UtilPrngTransactionBody; import com.hedera.node.app.hapi.utils.InvalidTransactionException; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveCall.java index 8fb1991073da..a08d4741c638 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveTranslator.java index 375273ff8ae1..d02d21909d61 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/hbarapprove/HbarApproveTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.CryptoAllowance; import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.Call; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.HasCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCall.java index 944d03c02905..92308199bf3c 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsTranslator.java index e5771f08633b..4c289164d8b0 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ import static java.util.Objects.requireNonNull; import com.esaulpaugh.headlong.abi.Function; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.Call; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.HasCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/DispatchForResponseCodeHssCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/DispatchForResponseCodeHssCall.java index 74a6640cdb39..0f35689962a3 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/DispatchForResponseCodeHssCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/DispatchForResponseCodeHssCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeCall.java index b675d85c972f..96a3d6768227 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,9 +27,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.scheduled.ScheduleCreateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslator.java index 171b1fd656d3..059e745e9c41 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/signschedule/SignScheduleTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/signschedule/SignScheduleTranslator.java index 534622f3fbdc..33e357e5713d 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/signschedule/SignScheduleTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hss/signschedule/SignScheduleTranslator.java @@ -34,8 +34,8 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.SignatureMap; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.ScheduleSignTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AddressIdConverter.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AddressIdConverter.java index 8e6bd2bba306..cc8707987d76 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AddressIdConverter.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AddressIdConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ */ public interface AddressIdConverter { /** - * Given an address to be referenced in a synthetic {@link com.hedera.hapi.node.base.TransactionBody}, + * Given an address to be referenced in a synthetic {@link com.hedera.hapi.node.transaction.TransactionBody}, * returns the {@link AccountID} that should be used in the synthetic transaction. * * @param address the address to be used in the synthetic transaction @@ -37,7 +37,7 @@ public interface AddressIdConverter { AccountID convert(@NonNull Address address); /** - * Given a Besu sender address to be referenced in a synthetic {@link com.hedera.hapi.node.base.TransactionBody}, + * Given a Besu sender address to be referenced in a synthetic {@link com.hedera.hapi.node.transaction.TransactionBody}, * returns the {@link AccountID} that should be used in the synthetic transaction. * * @param address the address to be used in the synthetic transaction diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/DispatchForResponseCodeHtsCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/DispatchForResponseCodeHtsCall.java index c09df72cb0a6..c52f1abb3594 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/DispatchForResponseCodeHtsCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/DispatchForResponseCodeHtsCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,8 +28,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropDecoder.java index b799fafe1393..0ec657739482 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,8 +25,8 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.NftTransfer; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenAirdropTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropTranslator.java index b3f9004e715c..c0cb03b4afff 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/airdrops/TokenAirdropTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsDecoder.java index be24daaa92b6..611399e188ed 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ import static java.util.Objects.requireNonNull; import com.esaulpaugh.headlong.abi.Address; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; import com.hedera.hapi.node.token.TokenDissociateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsTranslator.java index 99154be159c2..a44cc64c4b14 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/associations/AssociationsTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnDecoder.java index 71b0267e6082..1071a56aeba7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,8 +25,8 @@ import com.esaulpaugh.headlong.abi.TupleType; import com.google.common.primitives.Longs; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenBurnTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.DispatchForResponseCodeHtsCall; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnTranslator.java index 338be078ed1f..106d80a0c420 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/burn/BurnTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropDecoder.java index cf29d0b01250..c684ac60dc82 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ import com.esaulpaugh.headlong.abi.Address; import com.esaulpaugh.headlong.abi.Tuple; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.config.data.TokensConfig; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslator.java index 6e129ba8bd2a..3515e354776e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropDecoder.java index 6f27339b1d29..8071cedf201c 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ import com.esaulpaugh.headlong.abi.Address; import com.esaulpaugh.headlong.abi.Tuple; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenClaimAirdropTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.config.data.TokensConfig; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslator.java index 90bcc9d863ba..92ae61d762f5 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/ClassicCreatesCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/ClassicCreatesCall.java index a7edabec60a1..8b598e51441e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/ClassicCreatesCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/ClassicCreatesCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,10 +45,10 @@ import com.hedera.hapi.node.base.ContractID; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.token.TokenCreateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.ActiveContractVerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.scope.ActiveContractVerificationStrategy.UseTopLevelSigs; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoder.java index 074fad3bcdac..3c517b5a2e6f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,8 @@ import com.esaulpaugh.headlong.abi.Tuple; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Duration; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenCreateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoderFunction.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoderFunction.java index d76cdef0183e..0d1d750f52ee 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoderFunction.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateDecoderFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.create; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateTranslator.java index f54b987ba25c..058906ddc1dd 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/create/CreateTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import static com.hedera.node.app.hapi.utils.contracts.ParsingConstants.ROYALTY_FEE_V2; import com.esaulpaugh.headlong.abi.Function; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.config.data.ContractsConfig; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/delete/DeleteTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/delete/DeleteTranslator.java index b0a014340011..cd764819e3a3 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/delete/DeleteTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/delete/DeleteTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenDeleteTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoder.java index 6d2faaaf37f7..480ba781c508 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,9 @@ package com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.freeze; import com.esaulpaugh.headlong.abi.Address; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenFreezeAccountTransactionBody; import com.hedera.hapi.node.token.TokenUnfreezeAccountTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeTranslator.java index 0b38fde3103e..de0989201d0e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/freeze/FreezeUnfreezeTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/AbstractGrantApprovalCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/AbstractGrantApprovalCall.java index 5304011f9348..9beb0f0d2bb7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/AbstractGrantApprovalCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/AbstractGrantApprovalCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,12 +23,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.CryptoDeleteAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.NftRemoveAllowance; import com.hedera.hapi.node.token.TokenAllowance; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoder.java index 3642493831b4..cad1ef4df9dd 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ package com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.grantapproval; import com.esaulpaugh.headlong.abi.Address; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalTranslator.java index 12da6be52150..8892d642a519 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantapproval/GrantApprovalTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoder.java index ab1feaf313b1..60f8d10499f2 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ import static com.hedera.node.app.service.contract.impl.utils.ConversionUtils.asTokenId; import com.esaulpaugh.headlong.abi.Address; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenGrantKycTransactionBody; import com.hedera.hapi.node.token.TokenRevokeKycTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycTranslator.java index 527fa888b5c6..14db3f20a93e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintDecoder.java index 90c28eca859e..cef563649fc4 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ import com.esaulpaugh.headlong.abi.Address; import com.esaulpaugh.headlong.abi.TupleType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenMintTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.DispatchForResponseCodeHtsCall; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintTranslator.java index c7bd9a633de6..64a127958b57 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/mint/MintTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesDecoder.java index 5acd4e5e6010..9b6d411ffcdf 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ import static com.hedera.node.app.service.contract.impl.utils.ConversionUtils.asTokenId; import com.esaulpaugh.headlong.abi.Address; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenPauseTransactionBody; import com.hedera.hapi.node.token.TokenUnpauseTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; import javax.inject.Inject; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesTranslator.java index a06cd9bcec34..165e4b39a359 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/pauses/PausesTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensDecoder.java index bf2d865b68f4..89893d03f56e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,9 +23,9 @@ import com.esaulpaugh.headlong.abi.Address; import com.esaulpaugh.headlong.abi.Tuple; import com.hedera.hapi.node.base.NftID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenReference; import com.hedera.hapi.node.token.TokenRejectTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.config.data.LedgerConfig; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslator.java index 70478c3dcf68..b21bdb77d5b4 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllCall.java index c0c86c72e6ab..73db13c9a56d 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import com.esaulpaugh.headlong.abi.Tuple; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoder.java index 3556e9571b37..054331a5168e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllTranslator.java index 978737272fcd..96e3fbb8ff7e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/setapproval/SetApprovalForAllTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersCall.java index acd051761fcb..a753e96bdea3 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,9 +32,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersDecoder.java index 4629586967ba..da7635a76dea 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersTranslator.java index d825db2e8952..bfee6100667c 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/ClassicTransfersTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import static com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.transfer.SystemAccountCreditScreen.SYSTEM_ACCOUNT_CREDIT_SCREEN; import com.esaulpaugh.headlong.abi.Function; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.ReturnTypes; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc20TransfersCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc20TransfersCall.java index 59532b085b13..da10fe7961b9 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc20TransfersCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc20TransfersCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,9 +32,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc721TransferFromCall.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc721TransferFromCall.java index e1cd14ad6ce3..7b58d3814f2a 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc721TransferFromCall.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/transfer/Erc721TransferFromCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,8 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoder.java index c3a1fa5a79eb..119d176031da 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,11 +30,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenUpdateNftsTransactionBody; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; import com.hedera.hapi.node.token.TokenUpdateTransactionBody.Builder; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.DispatchForResponseCodeHtsCall; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoderFunction.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoderFunction.java index 8734850fcfb0..15fb96902014 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoderFunction.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateDecoderFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.update; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateExpiryTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateExpiryTranslator.java index b5649ead2812..1d91cf22dce1 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateExpiryTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateExpiryTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateKeysTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateKeysTranslator.java index b7efcf62a6eb..3076a6a433d8 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateKeysTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateKeysTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateNFTsMetadataTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateNFTsMetadataTranslator.java index 783d81abbff0..ada69222db8d 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateNFTsMetadataTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateNFTsMetadataTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateTranslator.java index 2a47e67465c9..162a449c5c59 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/update/UpdateTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesDecoder.java index 8e8cc9333428..7d746ee080ff 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,12 +23,12 @@ import com.hedera.hapi.node.base.Fraction; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenFeeScheduleUpdateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; import com.hedera.hapi.node.transaction.FixedFee; import com.hedera.hapi.node.transaction.FractionalFee; import com.hedera.hapi.node.transaction.RoyaltyFee; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.utils.ConversionUtils; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesTranslator.java index e4fd74d35fc3..75788816cfd1 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/updatetokencustomfees/UpdateTokenCustomFeesTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeDecoder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeDecoder.java index 06053248adfc..fc46e7db6221 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeDecoder.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ import static com.hedera.node.app.service.contract.impl.utils.ConversionUtils.asTokenId; import com.esaulpaugh.headlong.abi.Address; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenWipeAccountTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeTranslator.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeTranslator.java index f0cddc9892a6..9d7e43bfecc3 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeTranslator.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/wipe/WipeTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import com.esaulpaugh.headlong.abi.Function; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.AbstractCallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/SchedulingUtility.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/SchedulingUtility.java index 7fccf51b2d45..10a295580877 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/SchedulingUtility.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/SchedulingUtility.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,8 +17,8 @@ package com.hedera.node.app.service.contract.impl.exec.utils; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.workflows.HandleException; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/AbstractContractTransactionHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/AbstractContractTransactionHandler.java index 9b3775b57362..f2ab8b4aeb79 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/AbstractContractTransactionHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/AbstractContractTransactionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.hapi.utils.fee.SmartContractFeeBuilder; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCallHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCallHandler.java index ba6890941b8e..33eaf3c5a5c8 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCallHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCallHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import static com.hedera.node.app.spi.workflows.PreCheckException.validateTruePreCheck; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.hapi.utils.fee.SmartContractFeeBuilder; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCreateHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCreateHandler.java index cf0ec4e9e7ac..c5b05858dd09 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCreateHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractCreateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.hapi.utils.fee.SmartContractFeeBuilder; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractDeleteHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractDeleteHandler.java index ccc74c9cabe8..17d2b404a501 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractDeleteHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractDeleteTransactionBody; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.fee.SmartContractFeeBuilder; import com.hedera.node.app.service.contract.impl.records.ContractDeleteStreamBuilder; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemDeleteHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemDeleteHandler.java index fcfad94f1675..8ec908ee22eb 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemDeleteHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import static com.hedera.hapi.node.base.ResponseCodeEnum.NOT_SUPPORTED; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemUndeleteHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemUndeleteHandler.java index bc96e8909289..efac49e6a10e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemUndeleteHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractSystemUndeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import static com.hedera.hapi.node.base.ResponseCodeEnum.NOT_SUPPORTED; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractUpdateHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractUpdateHandler.java index 81fb027583f7..3c4fd2ce2a6e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractUpdateHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/ContractUpdateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,9 +40,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractUpdateTransactionBody; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.fee.SigValueObj; import com.hedera.node.app.hapi.utils.fee.SmartContractFeeBuilder; import com.hedera.node.app.service.contract.impl.records.ContractUpdateStreamBuilder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/EthereumTransactionHandler.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/EthereumTransactionHandler.java index 7d3bfdb19095..f93e8e890cac 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/EthereumTransactionHandler.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/handlers/EthereumTransactionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,8 +33,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxSigs; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; import com.hedera.node.app.service.contract.impl.exec.TransactionComponent; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/infra/HevmTransactionFactory.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/infra/HevmTransactionFactory.java index 9c9f3b576323..df8a14f84f01 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/infra/HevmTransactionFactory.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/infra/HevmTransactionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,10 +53,10 @@ import com.hedera.hapi.node.base.FileID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.service.contract.impl.ContractServiceImpl; import com.hedera.node.app.service.contract.impl.annotations.InitialState; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/TestHelpers.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/TestHelpers.java index 42bde1983d21..33a52cd25061 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/TestHelpers.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/TestHelpers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,6 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenSupplyType; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; @@ -66,6 +65,7 @@ import com.hedera.hapi.node.transaction.FixedFee; import com.hedera.hapi.node.transaction.FractionalFee; import com.hedera.hapi.node.transaction.RoyaltyFee; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.streams.CallOperationType; import com.hedera.hapi.streams.ContractAction; import com.hedera.hapi.streams.ContractActionType; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/ContextTransactionProcessorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/ContextTransactionProcessorTest.java index 68b98d14b3ea..ef6b5d29663b 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/ContextTransactionProcessorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/ContextTransactionProcessorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,9 +38,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TimestampSeconds; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.ExchangeRate; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.CallOutcome; import com.hedera.node.app.service.contract.impl.exec.ContextTransactionProcessor; import com.hedera.node.app.service.contract.impl.exec.TransactionProcessor; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/QueryModuleTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/QueryModuleTest.java index 12f6bcea6b80..2be8f73c4ede 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/QueryModuleTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/QueryModuleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.QueryModule; import com.hedera.node.app.service.contract.impl.exec.gas.CanonicalDispatchPrices; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/TransactionModuleTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/TransactionModuleTest.java index 67d9a5c8fd78..3e61a422583d 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/TransactionModuleTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/TransactionModuleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,9 +36,9 @@ import static org.mockito.Mockito.verify; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxSigs; import com.hedera.node.app.service.contract.impl.exec.FeatureFlags; import com.hedera.node.app.service.contract.impl.exec.TransactionModule; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/gas/SystemContractGasCalculatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/gas/SystemContractGasCalculatorTest.java index 0b0e29e9f64f..ae99e7c9f3c6 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/gas/SystemContractGasCalculatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/gas/SystemContractGasCalculatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.CanonicalDispatchPrices; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaNativeOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaNativeOperationsTest.java index 211b37e2cf56..c4bf09d6bcb9 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaNativeOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaNativeOperationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,9 +53,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HandleHederaNativeOperations; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaOperationsTest.java index 6db182c8967d..35718a0e1b51 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleHederaOperationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,13 +54,13 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.token.TokenCreateTransactionBody; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.gas.TinybarValues; import com.hedera.node.app.service.contract.impl.exec.scope.HandleHederaOperations; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java index 8f54c019c576..467bc9112bf7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/HandleSystemContractOperationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,8 +40,8 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HandleSystemContractOperations; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy.Decision; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/QuerySystemContractOperationsTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/QuerySystemContractOperationsTest.java index 7d4a9fc8d5b5..4d718812be79 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/QuerySystemContractOperationsTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/QuerySystemContractOperationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,9 +31,9 @@ import com.hedera.hapi.node.base.ContractID; import com.hedera.hapi.node.base.TimestampSeconds; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractFunctionResult; import com.hedera.hapi.node.transaction.ExchangeRate; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.QuerySystemContractOperations; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.spi.fees.ExchangeRateInfo; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/hbarApprove/HbarApproveCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/hbarApprove/HbarApproveCallTest.java index 4031077f7d10..4740df626a35 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/hbarApprove/HbarApproveCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/hbarApprove/HbarApproveCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.HasCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.hbarapprove.HbarApproveCall; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.hbarapprove.HbarApproveTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCallTest.java index bd0ec04d14d8..eecc6b8b1d38 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/has/setunlimitedautoassociations/SetUnlimitedAutoAssociationsCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.HasCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.has.setunlimitedautoassociations.SetUnlimitedAutoAssociationsCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/DispatchForResponseCodeHssCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/DispatchForResponseCodeHssCallTest.java index 21880694bdec..03ec2959a90f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/DispatchForResponseCodeHssCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/DispatchForResponseCodeHssCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hss.DispatchForResponseCodeHssCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslatorTest.java index e1a13b321060..4b18bd35968e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/schedulenative/ScheduleNativeTranslatorTest.java @@ -34,7 +34,7 @@ import static org.mockito.Mockito.any; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategies; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/signschedule/SignScheduleTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/signschedule/SignScheduleTranslatorTest.java index ec007e86d6a0..2f079980c019 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/signschedule/SignScheduleTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hss/signschedule/SignScheduleTranslatorTest.java @@ -41,8 +41,8 @@ import com.hedera.hapi.node.base.ScheduleID; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.SignaturePair; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.schedule.Schedule; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/DispatchForResponseCodeHtsCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/DispatchForResponseCodeHtsCallTest.java index 8826cfb6fa30..edd1c6e2d718 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/DispatchForResponseCodeHtsCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/DispatchForResponseCodeHtsCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,9 +31,9 @@ import static org.mockito.Mockito.verifyNoInteractions; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.token.TokenCreateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.DispatchForResponseCodeHtsCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/HtsCallAttemptTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/HtsCallAttemptTest.java index 6bb67c8728d8..cbaefda4b7d7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/HtsCallAttemptTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/HtsCallAttemptTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,8 +36,8 @@ import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.verifyNoInteractions; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenMintTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategies; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.common.CallTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/airdrops/TokenAirdropTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/airdrops/TokenAirdropTranslatorTest.java index e2cf3e9a55e4..cd1d0d159f05 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/airdrops/TokenAirdropTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/airdrops/TokenAirdropTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import static org.mockito.Mockito.when; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategies; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsDecoderTest.java index c23d1d608391..a9cfb9b0396e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.associations.AssociationsDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsTranslatorTest.java index 4b8abb72add2..cb7f59f664a8 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/associations/AssociationsTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.associations.AssociationsTranslator; import com.hedera.node.app.service.contract.impl.test.exec.systemcontracts.common.CallTestBase; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslatorTest.java index cffb508e24b6..26568e3d7d0a 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/cancelairdrops/TokenCancelAirdropTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import static org.mockito.Mockito.verify; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslatorTest.java index 00b5c1fdeef1..ee5655def64e 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/claimairdrops/TokenClaimAirdropTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import static org.mockito.Mockito.when; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java index 7dfb9b869825..7c6556623659 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,9 +38,9 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.scheduled.SchedulableTransactionBody; import com.hedera.hapi.node.token.TokenCreateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.create.ClassicCreatesCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/CreateDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/CreateDecoderTest.java index 0938b3e6dbfa..c3789f3e495f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/CreateDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/create/CreateDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,8 +46,8 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.transaction.CustomFee; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.create.CreateDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoderTest.java index 7d820b9aaedf..10310e9bffda 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/freeze/FreezeUnfreezeDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.freeze.FreezeUnfreezeDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java index e409ed46698a..9a3e3084f9ee 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.state.token.Token; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.grantapproval.ERCGrantApprovalCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoderTest.java index 775792b47dcd..aa77365b3a5f 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantapproval/GrantApprovalDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,9 +27,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.grantapproval.GrantApprovalDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoderTest.java index 0be83ad7f6a9..4006ad9c32a4 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/grantrevokekyc/GrantRevokeKycDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.grantrevokekyc.GrantRevokeKycDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/pauses/PausesDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/pauses/PausesDecoderTest.java index 460c48cc9d08..e3f0c4c654a4 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/pauses/PausesDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/pauses/PausesDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.pauses.PausesDecoder; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.pauses.PausesTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslatorTest.java index 13e38bae5c5e..62036e369899 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/rejecttokens/RejectTokensTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,9 +29,9 @@ import static org.mockito.Mockito.verify; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenReference; import com.hedera.hapi.node.token.TokenRejectTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.HederaNativeOperations; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllCallTest.java index 92268502e7c5..38afe338b000 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ import com.esaulpaugh.headlong.abi.Tuple; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoderTest.java index 744ee93c3957..8b5065502713 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/setapproval/SetApprovalForAllDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallAttempt; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.setapproval.SetApprovalForAllDecoder; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersCallTest.java index 5f46c6489081..4cc0b4a81274 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,8 +37,8 @@ import com.esaulpaugh.headlong.abi.TupleType; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.failure.CustomExceptionalHaltReason; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersDecoderTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersDecoderTest.java index 3121c64880fc..2a6ffd7471d2 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersDecoderTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersDecoderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import com.esaulpaugh.headlong.abi.Tuple; import com.hedera.hapi.node.base.AccountAmount; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.transfer.ClassicTransfersDecoder; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.transfer.ClassicTransfersTranslator; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersGasCalcTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersGasCalcTest.java index d832d283799f..4790c2f22cc5 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersGasCalcTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/ClassicTransfersGasCalcTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,9 +23,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.NftTransfer; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.DispatchType; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.transfer.ClassicTransfersCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc20TransfersCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc20TransfersCallTest.java index 830f9b8a0f32..2ee62b48b0f8 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc20TransfersCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc20TransfersCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.gas.SystemContractGasCalculator; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc721TransferFromCallTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc721TransferFromCallTest.java index 617538eba2a3..36c97405e53d 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc721TransferFromCallTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/transfer/Erc721TransferFromCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,8 @@ import com.esaulpaugh.headlong.abi.Address; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.transfer.Erc721TransferFromCall; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/update/UpdateTranslatorTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/update/UpdateTranslatorTest.java index c71fad3dcf7b..13d92969da66 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/update/UpdateTranslatorTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/systemcontracts/hts/update/UpdateTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,8 +44,8 @@ import static org.mockito.Mockito.verifyNoInteractions; import com.esaulpaugh.headlong.abi.Tuple; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategies; import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy; import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.AddressIdConverter; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCallHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCallHandlerTest.java index e86ac0827389..5d22d1890543 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCallHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCallHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,9 +29,9 @@ import static org.mockito.Mockito.mock; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; import com.hedera.node.app.service.contract.impl.exec.CallOutcome; import com.hedera.node.app.service.contract.impl.exec.ContextTransactionProcessor; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCreateHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCreateHandlerTest.java index 1e99c595e536..75b78bdc1136 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCreateHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractCreateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; import com.hedera.node.app.service.contract.impl.exec.CallOutcome; import com.hedera.node.app.service.contract.impl.exec.ContextTransactionProcessor; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractDeleteHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractDeleteHandlerTest.java index c9c1794dfa36..faaa32bc8593 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractDeleteHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractDeleteHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,9 +39,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ContractID; import com.hedera.hapi.node.base.Key; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.contract.ContractDeleteTransactionBody; import com.hedera.hapi.node.state.token.Account; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.handlers.ContractDeleteHandler; import com.hedera.node.app.service.contract.impl.records.ContractDeleteStreamBuilder; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractUpdateHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractUpdateHandlerTest.java index 973eff1aff03..f69b5471868c 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractUpdateHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/ContractUpdateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,11 +52,11 @@ import com.hedera.hapi.node.base.Duration; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractUpdateTransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Account.Builder; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.handlers.ContractUpdateHandler; import com.hedera.node.app.service.contract.impl.records.ContractUpdateStreamBuilder; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/EthereumTransactionHandlerTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/EthereumTransactionHandlerTest.java index 6be8e9545e12..c87e79f5ed42 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/EthereumTransactionHandlerTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/handlers/EthereumTransactionHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,9 +38,9 @@ import static org.mockito.Mockito.verifyNoInteractions; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.EthereumTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.service.contract.impl.ContractServiceComponent; import com.hedera.node.app.service.contract.impl.exec.CallOutcome; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java index ec00a54f33d0..c862f9d62dc7 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmStaticTransactionFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ import com.hedera.hapi.node.base.QueryHeader; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallLocalQuery; import com.hedera.hapi.node.transaction.Query; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.contract.impl.infra.HevmStaticTransactionFactory; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.spi.workflows.HandleException; diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmTransactionFactoryTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmTransactionFactoryTest.java index 53044b318011..c8c343cb5794 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmTransactionFactoryTest.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/infra/HevmTransactionFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -81,12 +81,12 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.contract.ContractCallTransactionBody; import com.hedera.hapi.node.contract.ContractCreateTransactionBody; import com.hedera.hapi.node.contract.EthereumTransactionBody; import com.hedera.hapi.node.state.file.File; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.ethereum.EthTxData; import com.hedera.node.app.hapi.utils.ethereum.EthTxSigs; import com.hedera.node.app.service.contract.impl.exec.FeatureFlags; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/CryptoSignatureWaiversImpl.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/CryptoSignatureWaiversImpl.java index 2b1e1dd551fe..e8f4b556a01d 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/CryptoSignatureWaiversImpl.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/CryptoSignatureWaiversImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2025 Hedera Hashgraph, LLC + * Copyright (C) 2020-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.CryptoSignatureWaivers; import com.hedera.node.app.service.token.TokenService; import com.hedera.node.app.spi.authorization.Authorizer; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoAddLiveHashHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoAddLiveHashHandler.java index 89066ebd5660..33cbf367e474 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoAddLiveHashHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoAddLiveHashHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoApproveAllowanceHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoApproveAllowanceHandler.java index 39c225d8652c..51a843f38b09 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoApproveAllowanceHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoApproveAllowanceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,6 @@ import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.AccountApprovalForAllAllowance; import com.hedera.hapi.node.state.token.AccountCryptoAllowance; @@ -53,6 +52,7 @@ import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java index f584fc57a33d..1024b86ec40d 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,10 +65,10 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteAllowanceHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteAllowanceHandler.java index 41b9456484c9..78812d9b856c 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteAllowanceHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteAllowanceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,9 @@ import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.NftRemoveAllowance; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteHandler.java index b68147a6f1ac..71058d3b9de1 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.hapi.utils.fee.CryptoFeeBuilder; import com.hedera.node.app.service.token.api.TokenServiceApi; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteLiveHashHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteLiveHashHandler.java index db9df51f0225..09a2ce8caf6c 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteLiveHashHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteLiveHashHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.workflows.HandleContext; import com.hedera.node.app.spi.workflows.HandleException; import com.hedera.node.app.spi.workflows.PreCheckException; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferHandler.java index a821b9b4f7b9..5565a7edd2c6 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,13 +39,13 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.transaction.AssessedCustomFee; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoUpdateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoUpdateHandler.java index 3e62c987e87f..4cd8e94db1f7 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoUpdateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoUpdateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,9 +48,9 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.CryptoSignatureWaivers; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAccountWipeHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAccountWipeHandler.java index be170b6aa241..63c9074cff55 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAccountWipeHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAccountWipeHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,10 +37,10 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAirdropHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAirdropHandler.java index c9e9c8c292c5..6c40d1b10d3c 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAirdropHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAirdropHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,10 +46,10 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.AccountPendingAirdrop; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAirdropStore; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAssociateToAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAssociateToAccountHandler.java index 8dbd167367c3..288a1577a1b2 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAssociateToAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenAssociateToAccountHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,9 +36,9 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.TxnUsageEstimator; import com.hedera.node.app.hapi.fees.usage.token.TokenAssociateUsage; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenBurnHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenBurnHandler.java index 1c718c536dc5..2c8ad612ef74 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenBurnHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenBurnHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,9 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableTokenRelationStore; import com.hedera.node.app.service.token.ReadableTokenStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCancelAirdropHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCancelAirdropHandler.java index 616486e11d65..17593f449f9a 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCancelAirdropHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCancelAirdropHandler.java @@ -37,8 +37,8 @@ import com.hedera.hapi.node.base.PendingAirdropId; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableAirdropStore; import com.hedera.node.app.service.token.impl.util.PendingAirdropUpdater; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenClaimAirdropHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenClaimAirdropHandler.java index 632e77e11494..59059b4233d1 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenClaimAirdropHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenClaimAirdropHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.token.TokenClaimAirdropTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableAirdropStore; import com.hedera.node.app.service.token.ReadableTokenStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCreateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCreateHandler.java index 34aef167c3a0..7f464a7c8cc1 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCreateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenCreateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenCreateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDeleteHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDeleteHandler.java index 8c388beaaa1f..bdc62f157e74 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDeleteHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,8 +27,8 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Token; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenDeleteUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDissociateFromAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDissociateFromAccountHandler.java index 4dfe3d580e15..f1954d52c143 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDissociateFromAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenDissociateFromAccountHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,11 +40,11 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenDissociateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenDissociateUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFeeScheduleUpdateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFeeScheduleUpdateHandler.java index 4a836dbfc813..8363fc4e08fd 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFeeScheduleUpdateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFeeScheduleUpdateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,10 +31,10 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenFeeScheduleUpdateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.token.TokenOpsUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFreezeAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFreezeAccountHandler.java index c05d1dcc2ea7..cf0f278d802d 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFreezeAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenFreezeAccountHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,9 +27,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenFreezeAccountTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenGrantKycToAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenGrantKycToAccountHandler.java index 411fee0f704f..54b78dcde816 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenGrantKycToAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenGrantKycToAccountHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,8 +28,8 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.TokenRelation; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenGrantKycUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenMintHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenMintHandler.java index 596986cc5cb8..75c467ff1324 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenMintHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenMintHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,10 +42,10 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenPauseHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenPauseHandler.java index 75b4667a4209..9245b14bb260 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenPauseHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenPauseHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenStore; import com.hedera.node.app.service.token.records.TokenBaseStreamBuilder; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRejectHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRejectHandler.java index d0baabbec072..b2023d0319eb 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRejectHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRejectHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,9 +53,9 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.TokenReference; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRevokeKycFromAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRevokeKycFromAccountHandler.java index e7548458b744..00dccfc3ea40 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRevokeKycFromAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenRevokeKycFromAccountHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,8 +28,8 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.TokenRelation; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenRevokeKycUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnfreezeAccountHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnfreezeAccountHandler.java index 0b410f1d11c1..5874abefbd61 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnfreezeAccountHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnfreezeAccountHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,9 +28,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUnfreezeAccountTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnpauseHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnpauseHandler.java index b18eb93709c0..2b2b8ef65bad 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnpauseHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUnpauseHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenStore; import com.hedera.node.app.service.token.records.TokenBaseStreamBuilder; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateHandler.java index af415968ea72..8977c733730a 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,11 +45,11 @@ import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.ThresholdKey; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.fees.usage.SigUsage; import com.hedera.node.app.hapi.fees.usage.token.TokenUpdateUsage; import com.hedera.node.app.hapi.utils.CommonPbjConverters; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateNftsHandler.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateNftsHandler.java index 0f86ce17d6c0..a10aa781d0f1 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateNftsHandler.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/TokenUpdateNftsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,9 +31,9 @@ import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.token.TokenUpdateNftsTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableNftStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/staking/EndOfStakingPeriodUtils.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/staking/EndOfStakingPeriodUtils.java index 7c926ece37f4..7af69ae8e48c 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/staking/EndOfStakingPeriodUtils.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/staking/EndOfStakingPeriodUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,11 +21,11 @@ import com.hedera.hapi.node.base.Fraction; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.NetworkStakingRewards; import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.transaction.NodeStake; import com.hedera.hapi.node.transaction.NodeStakeUpdateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableNetworkStakingRewardsStore; import com.hedera.node.config.data.StakingConfig; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AssociateTokenRecipientsStep.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AssociateTokenRecipientsStep.java index 058a5297da5b..a25f1b988b38 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AssociateTokenRecipientsStep.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AssociateTokenRecipientsStep.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,11 +37,11 @@ import com.hedera.hapi.node.base.NftTransfer; import com.hedera.hapi.node.base.TokenAssociation; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AutoAccountCreator.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AutoAccountCreator.java index 70d9631685e0..244755a41ef7 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AutoAccountCreator.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/AutoAccountCreator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,8 @@ import com.hedera.hapi.node.base.Duration; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.records.CryptoCreateStreamBuilder; import com.hedera.node.app.spi.workflows.HandleContext; diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/TransferExecutor.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/TransferExecutor.java index cbaa00b2c541..3d65ad1f8729 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/TransferExecutor.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/transfer/TransferExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,9 @@ import com.hedera.hapi.node.base.NftTransfer; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.handlers.BaseTokenHandler; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/CryptoSignatureWaiversImplTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/CryptoSignatureWaiversImplTest.java index c644457a4861..e4eed05357fd 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/CryptoSignatureWaiversImplTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/CryptoSignatureWaiversImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2025 Hedera Hashgraph, LLC + * Copyright (C) 2020-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import static org.mockito.BDDMockito.given; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.authorization.AuthorizerImpl; import com.hedera.node.app.authorization.PrivilegesVerifier; import com.hedera.node.app.service.token.impl.CryptoSignatureWaiversImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoAddLiveHashHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoAddLiveHashHandlerTest.java index b25d85811d2d..58ad0c63cb8b 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoAddLiveHashHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoAddLiveHashHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import static org.mockito.Mock.Strictness.LENIENT; import static org.mockito.Mockito.mock; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.CryptoAddLiveHashHandler; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoApproveAllowanceHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoApproveAllowanceHandlerTest.java index 5f0b53dd9905..6e0761ffbe7c 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoApproveAllowanceHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoApproveAllowanceHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,6 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; @@ -49,6 +48,7 @@ import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.ReadableAccountStoreImpl; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoCreateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoCreateHandlerTest.java index 0fdc3ae2b048..e20e28b0f47e 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoCreateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoCreateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,11 +61,11 @@ import com.hedera.hapi.node.base.Duration; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.ResponseCodeEnum; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.primitives.ProtoBytes; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoCreateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.handlers.CryptoCreateHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoHandlerTestBase; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteAllowanceHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteAllowanceHandlerTest.java index e8dec56ae216..37b5bfc6f409 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteAllowanceHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteAllowanceHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ import static org.mockito.Mockito.mock; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoDeleteAllowanceTransactionBody; import com.hedera.hapi.node.token.NftRemoveAllowance; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.CryptoDeleteAllowanceHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; import com.hedera.node.app.service.token.impl.validators.DeleteAllowanceValidator; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteHandlerTest.java index 8fbae5ca730a..7dbcbf852234 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoDeleteHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,11 +44,11 @@ import static org.mockito.Mockito.verify; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.primitives.ProtoBytes; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoDeleteTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.api.TokenServiceApi; import com.hedera.node.app.service.token.impl.ReadableAccountStoreImpl; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerPureChecksTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerPureChecksTest.java index 7b40527598d5..141bd3140373 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerPureChecksTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerPureChecksTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,9 +29,9 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.workflows.PreCheckException; import com.hedera.pbj.runtime.io.buffer.Bytes; import java.util.Collections; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTest.java index dc302f9c22b8..f222d2cb7dcc 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,12 +49,12 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTestBase.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTestBase.java index 1f4be35508dc..2eff004da9a0 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTestBase.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,13 +26,13 @@ import com.hedera.hapi.node.base.NftTransfer; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.token.TokenAirdropTransactionBody; import com.hedera.hapi.node.token.TokenClaimAirdropTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.CryptoTransferHandler; import com.hedera.node.app.service.token.impl.handlers.TokenAirdropHandler; import com.hedera.node.app.service.token.impl.handlers.TokenClaimAirdropHandler; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java index 016c3e8f205b..b329d963c734 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,10 +57,10 @@ import com.hedera.hapi.node.base.KeyList; import com.hedera.hapi.node.base.ThresholdKey; import com.hedera.hapi.node.base.Timestamp; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.token.CryptoUpdateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.CryptoSignatureWaiversImpl; import com.hedera.node.app.service.token.impl.ReadableAccountStoreImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAccountWipeHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAccountWipeHandlerTest.java index f570dada898c..790b0a5524c7 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAccountWipeHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAccountWipeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,6 @@ import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; @@ -57,6 +56,7 @@ import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenBurnTransactionBody; import com.hedera.hapi.node.token.TokenWipeAccountTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAirdropHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAirdropHandlerTest.java index 09a58235086d..284cf83cb0fd 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAirdropHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAirdropHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,10 +46,10 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.AccountPendingAirdrop; import com.hedera.hapi.node.token.TokenAirdropTransactionBody; import com.hedera.hapi.node.transaction.PendingAirdropRecord; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.fees.FeeContextImpl; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAirdropStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAssociateToAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAssociateToAccountHandlerTest.java index a3a1c264f86c..22bcb3d20355 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAssociateToAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAssociateToAccountHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,12 +45,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.common.EntityIDPair; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenBurnHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenBurnHandlerTest.java index d98ce7c0dcf4..264b2c645bbb 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenBurnHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenBurnHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,7 +55,6 @@ import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Nft; @@ -63,6 +62,7 @@ import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenAssociateTransactionBody; import com.hedera.hapi.node.token.TokenBurnTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableNftStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerPureChecksTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerPureChecksTest.java index 407009c6c8ba..fffd7e660925 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerPureChecksTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerPureChecksTest.java @@ -31,9 +31,9 @@ import com.hedera.hapi.node.base.PendingAirdropId; import com.hedera.hapi.node.base.PendingAirdropId.TokenReferenceOneOfType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.handlers.TokenCancelAirdropHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; import com.hedera.node.app.service.token.impl.util.PendingAirdropUpdater; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerTest.java index be39a3e75c3e..3f5dd0ca0dc2 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCancelAirdropHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.PendingAirdropId; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenCancelAirdropTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableAirdropStore; import com.hedera.node.app.service.token.impl.handlers.TokenCancelAirdropHandler; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java index 4f11b65f096c..6041da642e0e 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,11 +65,11 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenSupplyType; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenCreateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.handlers.TokenCreateHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; @@ -858,7 +858,7 @@ void failsForInvalidMetaDataKey() { /* --------------------------------- Helpers */ /** - * A builder for {@link com.hedera.hapi.node.base.TransactionBody} instances. + * A builder for {@link com.hedera.hapi.node.transaction.TransactionBody} instances. */ private class TokenCreateBuilder { private AccountID payer = payerId; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDeleteHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDeleteHandlerTest.java index 601fd3a09ae5..eb70327d002b 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDeleteHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDeleteHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,10 +30,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenDeleteTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableTokenStore; import com.hedera.node.app.service.token.impl.handlers.BaseCryptoHandler; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDissociateFromAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDissociateFromAccountHandlerTest.java index 990e18abd6b5..7a839931a42e 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDissociateFromAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenDissociateFromAccountHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,12 +44,12 @@ import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenDissociateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFeeScheduleUpdateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFeeScheduleUpdateHandlerTest.java index acdbb7a43a5d..e22ccbe3c5c8 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFeeScheduleUpdateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFeeScheduleUpdateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,11 +37,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenFeeScheduleUpdateTransactionBody; import com.hedera.hapi.node.transaction.CustomFee; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.fees.FeeContextImpl; import com.hedera.node.app.fees.FeeManager; import com.hedera.node.app.service.token.ReadableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFreezeAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFreezeAccountHandlerTest.java index ead8359a3ace..17eaed27a331 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFreezeAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenFreezeAccountHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,12 +39,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenFreezeAccountTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenGrantKycToAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenGrantKycToAccountHandlerTest.java index d07e9fe42384..e3a81b5f75d3 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenGrantKycToAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenGrantKycToAccountHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,12 +37,12 @@ import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenSupplyType; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenGrantKycTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.ReadableTokenStoreImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java index fdc401c52916..3fd3e1834580 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenMintHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,9 +40,9 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.TokenMintTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.handlers.TokenMintHandler; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenPauseHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenPauseHandlerTest.java index cb6250cbb14e..6a551d95cf32 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenPauseHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenPauseHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenPauseTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.ReadableTokenStoreImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRejectHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRejectHandlerTest.java index 0540a9af3c3f..7d8d90d1e049 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRejectHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRejectHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.NftID; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.TokenReference; import com.hedera.hapi.node.token.TokenRejectTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.fees.FeeContextImpl; import com.hedera.node.app.service.token.impl.handlers.TokenRejectHandler; import com.hedera.node.app.spi.fees.FeeCalculator; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRevokeKycFromAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRevokeKycFromAccountHandlerTest.java index b678aef65953..62aa84820992 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRevokeKycFromAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenRevokeKycFromAccountHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,12 +37,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenRevokeKycTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnfreezeAccountHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnfreezeAccountHandlerTest.java index 55bb7d2e432c..281924151843 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnfreezeAccountHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnfreezeAccountHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,12 +39,12 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUnfreezeAccountTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableTokenRelationStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnpauseHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnpauseHandlerTest.java index 3168158388a4..fcb5a593ebbf 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnpauseHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUnpauseHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,11 +35,11 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.token.TokenUnpauseTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.ReadableTokenStoreImpl; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateHandlerTest.java index 03d856c96414..3203980bafe2 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -67,10 +67,10 @@ import com.hedera.hapi.node.base.TokenAssociation; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenKeyValidation; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUpdateTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.ReadableTokenRelationStore; import com.hedera.node.app.service.token.ReadableTokenStore; @@ -1214,7 +1214,7 @@ void validateZeroTreasuryIsUpdatedForHapiCalls() { /* --------------------------------- Helpers --------------------------------- */ /** - * A builder for {@link com.hedera.hapi.node.base.TransactionBody} instances. + * A builder for {@link com.hedera.hapi.node.transaction.TransactionBody} instances. */ private class TokenUpdateBuilder { private AccountID payer = payerId; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateNftsHandlerTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateNftsHandlerTest.java index 1a6fd7aa1682..de9c5f9911b9 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateNftsHandlerTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenUpdateNftsHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,12 +42,12 @@ import com.hedera.hapi.node.base.SubType; import com.hedera.hapi.node.base.TokenID; import com.hedera.hapi.node.base.TokenType; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.Nft; import com.hedera.hapi.node.state.token.Token; import com.hedera.hapi.node.state.token.TokenRelation; import com.hedera.hapi.node.token.TokenUpdateNftsTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableNftStore; import com.hedera.node.app.service.token.ReadableTokenStore; import com.hedera.node.app.service.token.impl.WritableAccountStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/EndOfStakingPeriodUpdaterTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/EndOfStakingPeriodUpdaterTest.java index 1d67ecb56860..86ffbdbd2f7f 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/EndOfStakingPeriodUpdaterTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/EndOfStakingPeriodUpdaterTest.java @@ -32,13 +32,13 @@ import com.hedera.hapi.node.base.Timestamp; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.token.Account; import com.hedera.hapi.node.state.token.NetworkStakingRewards; import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.transaction.ExchangeRateSet; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.ReadableAccountStore; import com.hedera.node.app.service.token.impl.WritableNetworkStakingRewardsStore; import com.hedera.node.app.service.token.impl.WritableStakingInfoStore; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/StakeInfoHelperTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/StakeInfoHelperTest.java index 42a6fe2c1449..9fa8e815cb4d 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/StakeInfoHelperTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/staking/StakeInfoHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ import static org.mockito.Mockito.verify; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.state.common.EntityNumber; import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.WritableNetworkStakingRewardsStore; import com.hedera.node.app.service.token.impl.WritableStakingInfoStore; import com.hedera.node.app.service.token.impl.handlers.staking.StakeInfoHelper; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/StepsBase.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/StepsBase.java index 296e001f16e9..2f05546bd17f 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/StepsBase.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/StepsBase.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,13 +31,13 @@ import com.hedera.hapi.node.base.Key; import com.hedera.hapi.node.base.PendingAirdropId; import com.hedera.hapi.node.base.TokenTransferList; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.state.primitives.ProtoBytes; import com.hedera.hapi.node.token.CryptoTransferTransactionBody; import com.hedera.hapi.node.token.TokenAirdropTransactionBody; import com.hedera.hapi.node.token.TokenClaimAirdropTransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.WritableAccountStore; import com.hedera.node.app.service.token.impl.handlers.transfer.AdjustFungibleTokenChangesStep; import com.hedera.node.app.service.token.impl.handlers.transfer.AdjustHbarChangesStep; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/ApproveAllowanceValidatorTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/ApproveAllowanceValidatorTest.java index 7ff66522e8f1..4ae4384d7f30 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/ApproveAllowanceValidatorTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/ApproveAllowanceValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,13 +26,13 @@ import static org.mockito.Mock.Strictness.LENIENT; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.token.AccountApprovalForAllAllowance; import com.hedera.hapi.node.token.CryptoAllowance; import com.hedera.hapi.node.token.CryptoApproveAllowanceTransactionBody; import com.hedera.hapi.node.token.NftAllowance; import com.hedera.hapi.node.token.TokenAllowance; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; import com.hedera.node.app.service.token.impl.validators.ApproveAllowanceValidator; import com.hedera.node.app.spi.validation.ExpiryValidator; diff --git a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/DeleteAllowanceValidatorTest.java b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/DeleteAllowanceValidatorTest.java index 7a893420783d..634298c4ac8d 100644 --- a/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/DeleteAllowanceValidatorTest.java +++ b/hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/DeleteAllowanceValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,10 +29,10 @@ import com.hedera.hapi.node.base.AccountID; import com.hedera.hapi.node.base.TokenID; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.token.CryptoDeleteAllowanceTransactionBody; import com.hedera.hapi.node.token.NftRemoveAllowance; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.token.impl.test.handlers.util.CryptoTokenHandlerTestBase; import com.hedera.node.app.service.token.impl.validators.DeleteAllowanceValidator; import com.hedera.node.app.spi.validation.ExpiryValidator; diff --git a/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/CryptoSignatureWaivers.java b/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/CryptoSignatureWaivers.java index d04c8b171d73..7eec75f0a178 100644 --- a/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/CryptoSignatureWaivers.java +++ b/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/CryptoSignatureWaivers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2025 Hedera Hashgraph, LLC + * Copyright (C) 2021-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package com.hedera.node.app.service.token; import com.hedera.hapi.node.base.AccountID; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.SigWaivers; /** Signature waivers needed for transactions in {@link TokenService}. */ diff --git a/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/api/TokenServiceApi.java b/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/api/TokenServiceApi.java index c9e65621624c..a3eb2beb5008 100644 --- a/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/api/TokenServiceApi.java +++ b/hedera-node/hedera-token-service/src/main/java/com/hedera/node/app/service/token/api/TokenServiceApi.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ import edu.umd.cs.findbugs.annotations.Nullable; /** - * Defines mutations that can't be expressed as a {@link com.hedera.hapi.node.base.TransactionBody} dispatch. + * Defines mutations that can't be expressed as a {@link com.hedera.hapi.node.transaction.TransactionBody} dispatch. * *

Only exported to the contract service at this time, as it is the only service that currently needs such a thing. * If, for example, we extract a {@code StakingService}, this API would likely need to expand. diff --git a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java index 224355d1efbf..050316351fcf 100644 --- a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java +++ b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/AtomicBatchHandler.java @@ -19,7 +19,7 @@ import static java.util.Objects.requireNonNull; import com.hedera.hapi.node.base.HederaFunctionality; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.spi.workflows.HandleContext; import com.hedera.node.app.spi.workflows.HandleException; import com.hedera.node.app.spi.workflows.PreCheckException; diff --git a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilPrngHandler.java b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilPrngHandler.java index 2b795b61b6f1..307b1740a6d7 100644 --- a/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilPrngHandler.java +++ b/hedera-node/hedera-util-service-impl/src/main/java/com/hedera/node/app/service/util/impl/handlers/UtilPrngHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * Copyright (C) 2022-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.ResponseCodeEnum; import com.hedera.hapi.node.base.SubType; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.service.util.impl.records.PrngStreamBuilder; import com.hedera.node.app.spi.fees.FeeContext; import com.hedera.node.app.spi.fees.Fees; diff --git a/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilPrngHandlerTest.java b/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilPrngHandlerTest.java index c43a15cd53f9..5bbef2c613f4 100644 --- a/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilPrngHandlerTest.java +++ b/hedera-node/hedera-util-service-impl/src/test/java/com/hedera/node/app/service/util/impl/test/handlers/UtilPrngHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2025 Hedera Hashgraph, LLC + * Copyright (C) 2023-2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import com.hedera.hapi.node.base.TransactionBody; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.node.util.UtilPrngTransactionBody; import com.hedera.node.app.service.util.impl.handlers.UtilPrngHandler; import com.hedera.node.app.service.util.impl.records.PrngStreamBuilder; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/BlockTransactionParts.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/BlockTransactionParts.java index 05a158deda88..8109767325f2 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/BlockTransactionParts.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/BlockTransactionParts.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ import com.hedera.hapi.node.base.TokenAssociation; import com.hedera.hapi.node.base.TokenTransferList; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.base.TransferList; import com.hedera.hapi.node.transaction.AssessedCustomFee; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.pbj.runtime.io.buffer.Bytes; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/TransactionParts.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/TransactionParts.java index 21f90f84930b..5e3eb9daeb2a 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/TransactionParts.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/translators/inputs/TransactionParts.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import com.hedera.hapi.node.base.HederaFunctionality; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.transaction.SignedTransaction; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.hapi.util.UnknownHederaFunctionality; import com.hedera.pbj.runtime.ParseException; import com.hedera.pbj.runtime.io.buffer.Bytes; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/validators/block/BlockItemNonceValidator.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/validators/block/BlockItemNonceValidator.java index 10e67fe40875..d1d784ae9f4a 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/validators/block/BlockItemNonceValidator.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/support/validators/block/BlockItemNonceValidator.java @@ -19,8 +19,8 @@ import com.hedera.hapi.block.stream.Block; import com.hedera.hapi.block.stream.BlockItem; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.pbj.runtime.ParseException; import com.hedera.pbj.runtime.io.buffer.Bytes; import com.hedera.services.bdd.junit.support.BlockStreamValidator; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnFactory.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnFactory.java index 207e8a1348a0..a7900ead9a39 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnFactory.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnFactory.java @@ -132,15 +132,15 @@ public TransactionID sampleRecentTxnId() { /** * Given a {@link Consumer} that mutates a {@link TransactionBody.Builder}, return a {@link Transaction.Builder} * that incorporates this consumer along with default values for some notable - * {@link com.hedera.hapi.node.base.TransactionBody} fields if not overridden by the consumer. + * {@link com.hedera.hapi.node.transaction.TransactionBody} fields if not overridden by the consumer. * *

The fields given default values are, *

    - *
  1. {@link com.hedera.hapi.node.base.TransactionBody#transactionID()}
    2. - *
  2. {@link com.hedera.hapi.node.base.TransactionBody#nodeAccountID()}
    3. - *
  3. {@link com.hedera.hapi.node.base.TransactionBody#transactionFee()}
    4. - *
  4. {@link com.hedera.hapi.node.base.TransactionBody#transactionValidDuration()}
    5. - *
  5. {@link com.hedera.hapi.node.base.TransactionBody#memo()}
    6. + *
  6. {@link com.hedera.hapi.node.transaction.TransactionBody#transactionID()}
    7. + *
  7. {@link com.hedera.hapi.node.transaction.TransactionBody#nodeAccountID()}
    8. + *
  8. {@link com.hedera.hapi.node.transaction.TransactionBody#transactionFee()}
    9. + *
  9. {@link com.hedera.hapi.node.transaction.TransactionBody#transactionValidDuration()}
    10. + *
  10. {@link com.hedera.hapi.node.transaction.TransactionBody#memo()}
    11. *
* * @param bodySpec the {@link Consumer} that mutates the {@link TransactionBody.Builder} diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/EmbeddedVerbs.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/EmbeddedVerbs.java index 2e5c85a18aa0..d561c5ba5750 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/EmbeddedVerbs.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/EmbeddedVerbs.java @@ -25,7 +25,6 @@ import com.hedera.hapi.node.base.SignatureMap; import com.hedera.hapi.node.base.TimestampSeconds; import com.hedera.hapi.node.base.Transaction; -import com.hedera.hapi.node.base.TransactionBody; import com.hedera.hapi.node.base.TransactionID; import com.hedera.hapi.node.state.addressbook.Node; import com.hedera.hapi.node.state.blockrecords.BlockInfo; @@ -35,6 +34,7 @@ import com.hedera.hapi.node.state.token.AccountPendingAirdrop; import com.hedera.hapi.node.state.token.StakingNodeInfo; import com.hedera.hapi.node.state.token.Token; +import com.hedera.hapi.node.transaction.TransactionBody; import com.hedera.node.app.hapi.utils.CommonPbjConverters; import com.hedera.node.app.throttle.ThrottleAccumulator; import com.hedera.node.app.workflows.TransactionInfo; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/UtilVerbs.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/UtilVerbs.java index 08a85eb8942b..046c0b67e6e0 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/UtilVerbs.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/UtilVerbs.java @@ -2168,7 +2168,7 @@ public interface ScheduledExecutionAssertion { */ void test( @NonNull HapiSpec spec, - @NonNull com.hedera.hapi.node.base.TransactionBody body, + @NonNull com.hedera.hapi.node.transaction.TransactionBody body, @NonNull TransactionResult result); } From 9b853940b012cc471a807fbe0a8ee0ea05218849 Mon Sep 17 00:00:00 2001 From: JivkoKelchev Date: Wed, 29 Jan 2025 08:49:46 +0200 Subject: [PATCH 20/21] feat: Bump pbj to v0.9.16 (#17532) Signed-off-by: Zhivko Kelchev --- hapi/build.gradle.kts | 19 ++++++++++++-- .../services/transaction.proto | 2 +- .../formats/v6/BlockRecordWriterV6.java | 26 ++++--------------- .../formats/v7/BlockRecordFormatV7.java | 9 ++----- hiero-dependency-versions/build.gradle.kts | 2 +- 5 files changed, 26 insertions(+), 32 deletions(-) diff --git a/hapi/build.gradle.kts b/hapi/build.gradle.kts index 812f5752b0ea..c0961458418c 100644 --- a/hapi/build.gradle.kts +++ b/hapi/build.gradle.kts @@ -1,9 +1,24 @@ -// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { id("org.hiero.gradle.module.library") id("org.hiero.gradle.feature.protobuf") id("org.hiero.gradle.feature.test-fixtures") - id("com.hedera.pbj.pbj-compiler") version "0.9.2" + id("com.hedera.pbj.pbj-compiler") version "0.9.16" } description = "Hedera API" diff --git a/hapi/hedera-protobufs/services/transaction.proto b/hapi/hedera-protobufs/services/transaction.proto index 07c5178eee1a..0d5d37c0e16f 100644 --- a/hapi/hedera-protobufs/services/transaction.proto +++ b/hapi/hedera-protobufs/services/transaction.proto @@ -31,6 +31,7 @@ package proto; */ option java_package = "com.hederahashgraph.api.proto.java"; +// <<>> This comment is special code for setting PBJ Compiler java package option java_multiple_files = true; import "basic_types.proto"; @@ -117,7 +118,6 @@ import "event/state_signature_transaction.proto"; * The four deprecated fields will be removed and reserved in a future release. */ message Transaction { - // <<>> This comment is special code for setting PBJ Compiler java package /** * Replaced with `signedTransactionBytes`.
* The body of the transaction. diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/impl/producers/formats/v6/BlockRecordWriterV6.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/impl/producers/formats/v6/BlockRecordWriterV6.java index da7bdd049764..937599b787a6 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/impl/producers/formats/v6/BlockRecordWriterV6.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/impl/producers/formats/v6/BlockRecordWriterV6.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -309,19 +309,9 @@ private void writeHeader(@NonNull final SemanticVersion hapiProtoVersion) throws // Write the record file version int first to start of file outputStream.writeInt(VERSION_6); // [1] - hapi_proto_version - writeMessage( - outputStream, - HAPI_PROTO_VERSION, - hapiProtoVersion, - SemanticVersion.PROTOBUF::write, - SemanticVersion.PROTOBUF::measureRecord); + writeMessage(outputStream, HAPI_PROTO_VERSION, hapiProtoVersion, SemanticVersion.PROTOBUF); // [2] - start_object_running_hash - writeMessage( - outputStream, - START_OBJECT_RUNNING_HASH, - startObjectRunningHash, - HashObject.PROTOBUF::write, - HashObject.PROTOBUF::measureRecord); + writeMessage(outputStream, START_OBJECT_RUNNING_HASH, startObjectRunningHash, HashObject.PROTOBUF); } catch (final IOException e) { logger.warn("Error writing header to record file {}", recordFilePath, e); throw new UncheckedIOException(e); @@ -336,12 +326,7 @@ private void writeHeader(@NonNull final SemanticVersion hapiProtoVersion) throws private void writeFooter(@NonNull final HashObject endRunningHash) throws UncheckedIOException { try { // [4] - end_object_running_hash - writeMessage( - outputStream, - END_OBJECT_RUNNING_HASH, - endRunningHash, - HashObject.PROTOBUF::write, - HashObject.PROTOBUF::measureRecord); + writeMessage(outputStream, END_OBJECT_RUNNING_HASH, endRunningHash, HashObject.PROTOBUF); // [5] - block_number writeLong(outputStream, BLOCK_NUMBER, blockNumber); // [6] - sidecars @@ -349,8 +334,7 @@ private void writeFooter(@NonNull final HashObject endRunningHash) throws Unchec outputStream, SIDECARS, sidecarMetadata == null ? Collections.emptyList() : sidecarMetadata, - SidecarMetadata.PROTOBUF::write, - SidecarMetadata.PROTOBUF::measureRecord); + SidecarMetadata.PROTOBUF); } catch (IOException e) { logger.warn("Error writing footer to record file {}", recordFilePath, e); throw new UncheckedIOException(e); diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/impl/producers/formats/v7/BlockRecordFormatV7.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/impl/producers/formats/v7/BlockRecordFormatV7.java index 209ae29bbd66..bdb1849b9978 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/impl/producers/formats/v7/BlockRecordFormatV7.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/impl/producers/formats/v7/BlockRecordFormatV7.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -148,12 +148,7 @@ private void writeHeader( // Write the record file version int first to start of file outputStream.writeInt(VERSION_7); // [2] - start_object_running_hash - writeMessage( - outputStream, - START_OBJECT_RUNNING_HASH, - startObjectRunningHash, - com.hedera.hapi.streams.HashObject.PROTOBUF::write, - com.hedera.hapi.streams.HashObject.PROTOBUF::measureRecord); + writeMessage(outputStream, START_OBJECT_RUNNING_HASH, startObjectRunningHash, HashObject.PROTOBUF); } catch (IOException e) { throw new UncheckedIOException(e); } diff --git a/hiero-dependency-versions/build.gradle.kts b/hiero-dependency-versions/build.gradle.kts index 0f30a298ef3d..2d135572bbd5 100644 --- a/hiero-dependency-versions/build.gradle.kts +++ b/hiero-dependency-versions/build.gradle.kts @@ -79,7 +79,7 @@ dependencies.constraints { api("com.google.jimfs:jimfs:1.3.0") { because("com.google.common.jimfs") } api("com.google.protobuf:protobuf-java:$protobuf") { because("com.google.protobuf") } api("com.google.protobuf:protobuf-java-util:$protobuf") { because("com.google.protobuf.util") } - api("com.hedera.pbj:pbj-runtime:0.9.2") { because("com.hedera.pbj.runtime") } + api("com.hedera.pbj:pbj-runtime:0.9.16") { because("com.hedera.pbj.runtime") } api("com.squareup:javapoet:1.13.0") { because("com.squareup.javapoet") } api("net.java.dev.jna:jna:5.12.1") { because("com.sun.jna") } api("com.google.dagger:dagger:$dagger") { because("dagger") } From 86bf0946e19e21c9c7aeb3f9c434e9bfde797995 Mon Sep 17 00:00:00 2001 From: Zhivko Kelchev Date: Wed, 29 Jan 2025 18:02:55 +0200 Subject: [PATCH 21/21] feat: Hip 551 hapi verbs (#17390) Signed-off-by: Zhivko Kelchev --- .../node/app/services/ServiceScopeLookup.java | 2 +- .../bdd/junit/hedera/utils/GrpcUtils.java | 4 +- .../services/bdd/spec/HapiSpecOperation.java | 2 + .../bdd/spec/transactions/HapiTxnOp.java | 16 ++ .../bdd/spec/transactions/TxnFactory.java | 5 + .../bdd/spec/transactions/TxnVerbs.java | 5 + .../transactions/util/HapiAtomicBatch.java | 140 ++++++++++++++++++ .../bdd/suites/hip551/AtomicBatchTest.java | 69 +++++++++ 8 files changed, 241 insertions(+), 2 deletions(-) create mode 100644 hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/util/HapiAtomicBatch.java create mode 100644 hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/hip551/AtomicBatchTest.java diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/ServiceScopeLookup.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/ServiceScopeLookup.java index d49ccd596af5..f1d7a2e5a879 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/ServiceScopeLookup.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/ServiceScopeLookup.java @@ -106,7 +106,7 @@ public String getServiceName(@NonNull final TransactionBody txBody) { TOKEN_CANCEL_AIRDROP, TOKEN_REJECT -> TokenService.NAME; - case UTIL_PRNG -> UtilService.NAME; + case UTIL_PRNG, ATOMIC_BATCH -> UtilService.NAME; case SYSTEM_DELETE -> switch (txBody.systemDeleteOrThrow().id().kind()) { case CONTRACT_ID -> ContractService.NAME; diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/hedera/utils/GrpcUtils.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/hedera/utils/GrpcUtils.java index bbbdb2d26f84..6647ac2b7cb6 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/hedera/utils/GrpcUtils.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/hedera/utils/GrpcUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -220,6 +220,8 @@ public static TransactionResponse submit( .cancelAirdrop(transaction); case TokenClaimAirdrop -> clients.getTokenSvcStub(nodeAccountId, false, false) .claimAirdrop(transaction); + case AtomicBatch -> clients.getUtilSvcStub(nodeAccountId, false, false) + .atomicBatch(transaction); default -> throw new IllegalArgumentException(functionality + " is not a transaction"); }; } diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/HapiSpecOperation.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/HapiSpecOperation.java index ef48ddd07830..d7a595daf88c 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/HapiSpecOperation.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/HapiSpecOperation.java @@ -129,6 +129,7 @@ public abstract class HapiSpecOperation implements SpecOperation { protected Optional controlOverrides = Optional.empty(); protected Map overrides = Collections.EMPTY_MAP; + protected Optional> batchKey = Optional.empty(); protected Optional fee = Optional.empty(); protected List> maxCustomFeeList = new ArrayList<>(); protected Optional validDurationSecs = Optional.empty(); @@ -292,6 +293,7 @@ protected Consumer bodyDef(final HapiSpec spec) { Duration.newBuilder().setSeconds(s).build())); genRecord.ifPresent(builder::setGenerateRecord); memo.ifPresent(builder::setMemo); + batchKey.ifPresent(k -> builder.setBatchKey(k.apply(spec))); }; } diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/HapiTxnOp.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/HapiTxnOp.java index ed0a200d1fc0..2871e9a907f4 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/HapiTxnOp.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/HapiTxnOp.java @@ -67,6 +67,7 @@ import com.hederahashgraph.api.proto.java.TransactionBody; import com.hederahashgraph.api.proto.java.TransactionGetReceiptResponse; import com.hederahashgraph.api.proto.java.TransactionReceipt; +import com.hederahashgraph.api.proto.java.TransactionRecord; import com.hederahashgraph.api.proto.java.TransactionResponse; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; @@ -871,4 +872,19 @@ public boolean hasActualStatus() { public ResponseCodeEnum getActualStatus() { return lastReceipt.getStatus(); } + + public void updateStateFromRecord(TransactionRecord record, HapiSpec spec) throws Throwable { + this.actualStatus = record.getReceipt().getStatus(); + this.lastReceipt = record.getReceipt(); + updateStateOf(spec); + } + + public T batchKey(String key) { + batchKey = Optional.of(spec -> spec.registry().getKey(key)); + return self(); + } + + public Optional getNode() { + return node; + } } diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnFactory.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnFactory.java index a7900ead9a39..3a6f9e44f47a 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnFactory.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnFactory.java @@ -26,6 +26,7 @@ import com.hedera.services.bdd.spec.HapiSpec; import com.hedera.services.bdd.spec.HapiSpecSetup; import com.hedera.services.bdd.spec.utilops.mod.BodyMutation; +import com.hederahashgraph.api.proto.java.AtomicBatchTransactionBody; import com.hederahashgraph.api.proto.java.ConsensusCreateTopicTransactionBody; import com.hederahashgraph.api.proto.java.ConsensusDeleteTopicTransactionBody; import com.hederahashgraph.api.proto.java.ConsensusSubmitMessageTransactionBody; @@ -467,4 +468,8 @@ public Consumer defaultDefTokenClaimAi public Consumer defaultDefTokenAirdropTransactionBody() { return builder -> {}; } + + public Consumer defaultDefAtomicBatchTransactionBody() { + return builder -> {}; + } } diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnVerbs.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnVerbs.java index f7035f217e84..b287affaae6c 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnVerbs.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnVerbs.java @@ -99,6 +99,7 @@ import com.hedera.services.bdd.spec.transactions.token.HapiTokenUpdateNfts; import com.hedera.services.bdd.spec.transactions.token.HapiTokenWipe; import com.hedera.services.bdd.spec.transactions.token.TokenMovement; +import com.hedera.services.bdd.spec.transactions.util.HapiAtomicBatch; import com.hedera.services.bdd.spec.transactions.util.HapiUtilPrng; import com.hedera.services.bdd.spec.utilops.CustomSpecAssert; import com.hederahashgraph.api.proto.java.ContractCreateTransactionBody; @@ -770,4 +771,8 @@ public static HapiUtilPrng hapiPrng() { public static HapiUtilPrng hapiPrng(int range) { return new HapiUtilPrng(range); } + + public static HapiAtomicBatch atomicBatch(HapiTxnOp... ops) { + return new HapiAtomicBatch(ops); + } } diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/util/HapiAtomicBatch.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/util/HapiAtomicBatch.java new file mode 100644 index 000000000000..c020fe614796 --- /dev/null +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/util/HapiAtomicBatch.java @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2020-2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.hedera.services.bdd.spec.transactions.util; + +import static com.hedera.services.bdd.spec.queries.QueryVerbs.getTxnRecord; +import static com.hedera.services.bdd.spec.transactions.TxnUtils.extractTxnId; +import static com.hedera.services.bdd.spec.transactions.TxnUtils.suFrom; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.SUCCESS; + +import com.google.common.base.MoreObjects; +import com.hedera.node.app.hapi.fees.usage.BaseTransactionMeta; +import com.hedera.node.app.hapi.fees.usage.crypto.CryptoCreateMeta; +import com.hedera.node.app.hapi.fees.usage.state.UsageAccumulator; +import com.hedera.node.app.hapi.utils.fee.SigValueObj; +import com.hedera.services.bdd.spec.HapiSpec; +import com.hedera.services.bdd.spec.fees.AdapterUtils; +import com.hedera.services.bdd.spec.queries.meta.HapiGetTxnRecord; +import com.hedera.services.bdd.spec.transactions.HapiTxnOp; +import com.hederahashgraph.api.proto.java.AtomicBatchTransactionBody; +import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.HederaFunctionality; +import com.hederahashgraph.api.proto.java.Key; +import com.hederahashgraph.api.proto.java.Transaction; +import com.hederahashgraph.api.proto.java.TransactionBody; +import com.hederahashgraph.api.proto.java.TransactionID; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Consumer; +import java.util.function.Function; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class HapiAtomicBatch extends HapiTxnOp { + static final Logger log = LogManager.getLogger(HapiAtomicBatch.class); + + private static final String DEFAULT_NODE_ACCOUNT_ID = "0.0.0"; + private List> operationsToBatch; + private final Map> operationsMap = new HashMap<>(); + + public HapiAtomicBatch(HapiTxnOp... ops) { + this.operationsToBatch = Arrays.stream(ops).toList(); + } + + @Override + public HederaFunctionality type() { + return HederaFunctionality.AtomicBatch; + } + + @Override + protected HapiAtomicBatch self() { + return this; + } + + @Override + protected long feeFor(final HapiSpec spec, final Transaction txn, final int numPayerKeys) throws Throwable { + // TODO: Implement proper estimate for AtomicBatch + return 20_000_000L; // spec.fees().forActivityBasedOp(HederaFunctionality.AtomicBatch, this::usageEstimate, txn, + // numPayerKeys); + } + + private FeeData usageEstimate(final TransactionBody txn, final SigValueObj svo) { + // TODO: check for correct estimation of the batch + final var baseMeta = new BaseTransactionMeta(txn.getMemoBytes().size(), 0); + final var opMeta = new CryptoCreateMeta(txn.getCryptoCreateAccount()); + final var accumulator = new UsageAccumulator(); + cryptoOpsUsage.cryptoCreateUsage(suFrom(svo), baseMeta, opMeta, accumulator); + return AdapterUtils.feeDataFrom(accumulator); + } + + @Override + protected Consumer opBodyDef(final HapiSpec spec) throws Throwable { + final AtomicBatchTransactionBody opBody = spec.txns() + .body( + AtomicBatchTransactionBody.class, b -> { + for (HapiTxnOp op : operationsToBatch) { + try { + // set node account id to 0.0.0 if not set + if (op.getNode().isEmpty()) { + op.setNode(DEFAULT_NODE_ACCOUNT_ID); + } + // create a transaction for each operation + final var transaction = op.signedTxnFor(spec); + // save transaction id + final var txnId = extractTxnId(transaction); + operationsMap.put(txnId, op); + // add the transaction to the batch + b.addTransactions(transaction); + } catch (Throwable e) { + throw new RuntimeException(e); + } + } + }); + return b -> b.setAtomicBatch(opBody); + } + + @Override + public void updateStateOf(HapiSpec spec) throws Throwable { + if (actualStatus == SUCCESS) { + for (Map.Entry> entry : operationsMap.entrySet()) { + TransactionID txnId = entry.getKey(); + HapiTxnOp op = entry.getValue(); + + final HapiGetTxnRecord recordQuery = + getTxnRecord(txnId).noLogging().assertingNothing(); + final Optional error = recordQuery.execFor(spec); + if (error.isPresent()) { + throw error.get(); + } + op.updateStateFromRecord(recordQuery.getResponseRecord(), spec); + } + } + } + + @Override + protected List> defaultSigners() { + return Arrays.asList(spec -> spec.registry().getKey(effectivePayer(spec))); + } + + @Override + protected MoreObjects.ToStringHelper toStringHelper() { + return super.toStringHelper().add("range", operationsToBatch); + } +} diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/hip551/AtomicBatchTest.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/hip551/AtomicBatchTest.java new file mode 100644 index 000000000000..fdd43e2d7c12 --- /dev/null +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/hip551/AtomicBatchTest.java @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.hedera.services.bdd.suites.hip551; + +import static com.hedera.services.bdd.spec.HapiSpec.hapiTest; +import static com.hedera.services.bdd.spec.queries.QueryVerbs.getAccountBalance; +import static com.hedera.services.bdd.spec.queries.QueryVerbs.getTxnRecord; +import static com.hedera.services.bdd.spec.transactions.TxnVerbs.atomicBatch; +import static com.hedera.services.bdd.spec.transactions.TxnVerbs.cryptoCreate; +import static com.hedera.services.bdd.spec.utilops.UtilVerbs.usableTxnIdNamed; +import static com.hedera.services.bdd.suites.HapiSuite.ONE_HBAR; + +import com.hedera.services.bdd.junit.HapiTest; +import com.hedera.services.bdd.junit.HapiTestLifecycle; +import java.util.stream.Stream; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.DynamicTest; + +@HapiTestLifecycle +public class AtomicBatchTest { + + @HapiTest + @Disabled + // just test that the batch is submitted + // disabled for now because there is no handler logic and streamValidation is failing in CI + public Stream simpleBatchTest() { + final var batchOperator = "batchOperator"; + final var innerTnxPayer = "innerPayer"; + final var innerTxnId = "innerId"; + + // create inner txn with: + // - custom txn id -> for getting the record + // - batch key -> for batch operator to sign + // - payer -> for paying the fee + final var innerTxn = cryptoCreate("foo") + .balance(ONE_HBAR) + .txnId(innerTxnId) + .batchKey(batchOperator) + .payingWith(innerTnxPayer); + + return hapiTest( + // create batch operator + cryptoCreate(batchOperator).balance(ONE_HBAR), + // create another payer for the inner txn + cryptoCreate(innerTnxPayer).balance(ONE_HBAR), + // use custom txn id so we can get the record + usableTxnIdNamed(innerTxnId).payerId(innerTnxPayer), + // create a batch txn + atomicBatch(innerTxn).payingWith(batchOperator), + // get and log inner txn record + getTxnRecord(innerTxnId).assertingNothingAboutHashes().logged(), + // validate the batch txn result + getAccountBalance("foo").hasTinyBars(ONE_HBAR)); + } +}