Extend OperationTracer with new methods (hyperledger#5662)

* Extend OperationTracer with new methods, create Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Rename ExtendedOperationTracer to BlockAwareOperationTracer Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * fixed plugin api hash Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * added missing javadoc comments Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Update evm/src/main/java/org/hyperledger/besu/evm/tracing/OperationTracer.java Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Only update peer with the first and last block (hyperledger#5659) * only update peer with the first and last block Signed-off-by: Stefan <stefan.pingel@consensys.net> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Put download links into CHANGELOG and do some clean up (hyperledger#5660) * put the download links for 23.4.4 into the CHANGELOG.md * clean up CHANGELOG Signed-off-by: Stefan <stefan.pingel@consensys.net> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Add --amend to docker manifest create to fix docker latest tag (hyperledger#5661) We need to replace previous release's latest tag. Might be broken due to a recent change in the docker command implementation Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Add Xlayered-tx-pool to the config log printout (hyperledger#5665) Unrelated: clarify epoch length in javadoc Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Add hooks to AbstractCreateOperation for library users (hyperledger#5656) Add hooks for a successful contract create, a failed contract create, and an invalid contact create. Users of the library will be able to customize create responses without having to replace core logic. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Test updates for cancun execution-spec-tests (hyperledger#5670) - support legacy V values (larger V value) and type 1+ (v is recId only) - new fields - shared transaction extraction - rejection detection Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Upgrade BouncyCastle libraries (hyperledger#5675) Upgrade bouncy castle to v1.75. This involved a change in maven coordinates for other modules. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Introduce transaction validator interface (phase 1) (hyperledger#5673) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Only validate `--miner-enabled` option for ethash networks (hyperledger#5669) * Modify the min-gas-price option validation * Check for whether ethash is in use, either from genesis or network config, and use that for miner checks * Add genesis configuration isPoa() convenience function --------- Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> Signed-off-by: Matt Whitehead <matthew1001@hotmail.com> Co-authored-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Update tuweni2.4.2 (hyperledger#5684) * Revert "Revert "Update Tuweni to 2.4.1 (hyperledger#5513)" (hyperledger#5585)" This reverts commit 6111e1b. Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com> * update Tuweni to 2.4.2 Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com> --------- Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * Do not leak references to PendingTransactions (hyperledger#5693) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * remove v0 version of the database (hyperledger#5698) Signed-off-by: Karim TAAM <karim.t2am@gmail.com> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * updated plugin api hash Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * spotless Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * updating plugin api hash Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * moved transcation interface to datatypes to use it in the OperationTracer.traceStartTransaction method Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * fix import Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> --------- Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> Signed-off-by: Stefan <stefan.pingel@consensys.net> Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> Signed-off-by: Matt Whitehead <matthew1001@hotmail.com> Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com> Signed-off-by: Karim TAAM <karim.t2am@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> Co-authored-by: Simon Dudley <simon.dudley@consensys.net> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Co-authored-by: Danno Ferrin <danno.ferrin@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Matt Whitehead <matthew1001@gmail.com> Co-authored-by: Antoine Toulme <antoine@lunar-ocean.com> Co-authored-by: matkt <karim.t2am@gmail.com>
daniellehrner · Jul 20, 2023 · 1a08770 · 1a08770
1 parent 03ff688
commit 1a08770
Show file tree

Hide file tree

Showing 85 changed files with 280 additions and 101 deletions.
diff --git a/...va/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java b/...va/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.tests.acceptance.dsl.transaction.account;
 
 import org.hyperledger.besu.crypto.SignatureAlgorithm;
-import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;

diff --git a/...va/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java b/...va/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java
@@ -16,7 +16,7 @@
 
 import org.hyperledger.besu.crypto.SignatureAlgorithm;
 import org.hyperledger.besu.datatypes.Hash;
-import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;

diff --git a/...hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java b/...hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java
@@ -18,7 +18,7 @@
 
 import org.hyperledger.besu.crypto.SECP256K1;
 import org.hyperledger.besu.crypto.SignatureAlgorithm;
-import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
 

diff --git a/...g/hyperledger/besu/tests/acceptance/plugins/privacy/TestPrivacyPluginPayloadProvider.java b/...g/hyperledger/besu/tests/acceptance/plugins/privacy/TestPrivacyPluginPayloadProvider.java
@@ -18,9 +18,9 @@
 import static org.hyperledger.besu.ethereum.privacy.PrivateTransaction.readFrom;
 import static org.hyperledger.besu.ethereum.privacy.PrivateTransaction.serialize;
 
+import org.hyperledger.besu.datatypes.Transaction;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.plugin.data.PrivateTransaction;
-import org.hyperledger.besu.plugin.data.Transaction;
 import org.hyperledger.besu.plugin.services.privacy.PrivacyPluginPayloadProvider;
 
 import java.util.Optional;

diff --git a/...ger/besu/tests/acceptance/plugins/privacy/TestSigningPrivateMarkerTransactionFactory.java b/...ger/besu/tests/acceptance/plugins/privacy/TestSigningPrivateMarkerTransactionFactory.java
@@ -22,11 +22,11 @@
 import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.plugin.data.PrivateTransaction;
-import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.plugin.data.UnsignedPrivateMarkerTransaction;
 import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
 

diff --git a/besu/src/main/java/org/hyperledger/besu/services/TraceServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/TraceServiceImpl.java
@@ -30,9 +30,9 @@
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
-import org.hyperledger.besu.evm.tracing.OperationTracer;
 import org.hyperledger.besu.plugin.Unstable;
 import org.hyperledger.besu.plugin.services.TraceService;
+import org.hyperledger.besu.plugin.services.tracer.BlockAwareOperationTracer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -68,7 +68,7 @@ public TraceServiceImpl(
    * @param tracer an instance of OperationTracer
    */
   @Override
-  public void traceBlock(final long blockNumber, final OperationTracer tracer) {
+  public void traceBlock(final long blockNumber, final BlockAwareOperationTracer tracer) {
     checkArgument(tracer != null);
     final Optional<Block> block = blockchainQueries.getBlockchain().getBlockByNumber(blockNumber);
     block.ifPresent(value -> trace(value, tracer));
@@ -81,13 +81,13 @@ public void traceBlock(final long blockNumber, final OperationTracer tracer) {
    * @param tracer an instance of OperationTracer
    */
   @Override
-  public void traceBlock(final Hash hash, final OperationTracer tracer) {
+  public void traceBlock(final Hash hash, final BlockAwareOperationTracer tracer) {
     checkArgument(tracer != null);
     final Optional<Block> block = blockchainQueries.getBlockchain().getBlockByHash(hash);
     block.ifPresent(value -> trace(value, tracer));
   }
 
-  private void trace(final Block block, final OperationTracer tracer) {
+  private void trace(final Block block, final BlockAwareOperationTracer tracer) {
     LOG.debug("Tracing block {}", block.toLogString());
     final List<TransactionProcessingResult> results = new ArrayList<>();
     Tracer.processTracing(
@@ -100,6 +100,9 @@ private void trace(final Block block, final OperationTracer tracer) {
           final MainnetTransactionProcessor transactionProcessor =
               protocolSpec.getTransactionProcessor();
           final BlockHeader header = block.getHeader();
+
+          tracer.traceStartBlock(block.getHeader(), block.getBody());
+
           block
               .getBody()
               .getTransactions()
@@ -114,6 +117,9 @@ private void trace(final Block block, final OperationTracer tracer) {
                                 maybeParentHeader
                                     .flatMap(BlockHeader::getExcessDataGas)
                                     .orElse(DataGas.ZERO));
+
+                    tracer.traceStartTransaction(transaction);
+
                     final TransactionProcessingResult result =
                         transactionProcessor.processTransaction(
                             blockchain,
@@ -125,9 +131,15 @@ private void trace(final Block block, final OperationTracer tracer) {
                             new CachingBlockHashLookup(header, blockchain),
                             false,
                             dataGasPrice);
+
+                    long transactionGasUsed = transaction.getGasLimit() - result.getGasRemaining();
+                    tracer.traceEndTransaction(result.getOutput(), transactionGasUsed, 0);
+
                     results.add(result);
                   });
           return Optional.of(results);
         });
+
+    tracer.traceEndBlock(block.getHeader(), block.getBody());
   }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/PrivacyReorgTest.java b/besu/src/test/java/org/hyperledger/besu/PrivacyReorgTest.java
@@ -28,6 +28,7 @@
 import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.enclave.Enclave;
 import org.hyperledger.besu.enclave.EnclaveFactory;
@@ -59,7 +60,6 @@
 import org.hyperledger.besu.evm.log.LogsBloomFilter;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.data.Restriction;
-import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.testutil.TestClock;
 
 import java.io.IOException;

diff --git a/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java b/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java
@@ -23,6 +23,7 @@
 import org.hyperledger.besu.crypto.KeyPair;
 import org.hyperledger.besu.crypto.SignatureAlgorithm;
 import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Transaction;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.DefaultBlockchain;
@@ -61,7 +62,6 @@
 import org.hyperledger.besu.plugin.data.LogWithMetadata;
 import org.hyperledger.besu.plugin.data.PropagatedBlockContext;
 import org.hyperledger.besu.plugin.data.SyncStatus;
-import org.hyperledger.besu.plugin.data.Transaction;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 import org.hyperledger.besu.testutil.TestClock;
 

diff --git a/...rledger/besu/plugin/data/Transaction.java → ...perledger/besu/datatypes/Transaction.java b/...rledger/besu/plugin/data/Transaction.java → ...perledger/besu/datatypes/Transaction.java
@@ -12,12 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.plugin.data;
-
-import org.hyperledger.besu.datatypes.Address;
-import org.hyperledger.besu.datatypes.Hash;
-import org.hyperledger.besu.datatypes.Quantity;
-import org.hyperledger.besu.plugin.Unstable;
+package org.hyperledger.besu.datatypes;
 
 import java.math.BigInteger;
 import java.util.Optional;
@@ -64,7 +59,6 @@ public interface Transaction {
    *
    * @return the quantity of Wei for max fee per gas
    */
-  @Unstable
   default Optional<? extends Quantity> getMaxPriorityFeePerGas() {
     return Optional.empty();
   }
@@ -74,7 +68,6 @@ default Optional<? extends Quantity> getMaxPriorityFeePerGas() {
    *
    * @return the quantity of Wei for fee cap.
    */
-  @Unstable
   default Optional<? extends Quantity> getMaxFeePerGas() {
     return Optional.empty();
   }
@@ -85,7 +78,6 @@ default Optional<? extends Quantity> getMaxFeePerGas() {
    *
    * @return the quantity of Wei for fee per data gas.
    */
-  @Unstable
   default Optional<? extends Quantity> getMaxFeePerDataGas() {
     return Optional.empty();
   }
@@ -190,6 +182,5 @@ default Optional<? extends Quantity> getMaxFeePerDataGas() {
    *
    * @return the type of the transaction
    */
-  @Unstable
   TransactionType getType();
 }
diff --git a/...ger/besu/plugin/data/TransactionType.java → ...edger/besu/datatypes/TransactionType.java b/...ger/besu/plugin/data/TransactionType.java → ...edger/besu/datatypes/TransactionType.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.plugin.data;
+package org.hyperledger.besu.datatypes;
 
 import java.util.Arrays;
 import java.util.EnumSet;

diff --git a/...integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java b/...integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java
@@ -38,6 +38,7 @@
 import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
@@ -52,7 +53,6 @@
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.evm.log.LogsBloomFilter;
-import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

diff --git a/...ger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByHashIntegrationTest.java b/...ger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByHashIntegrationTest.java
@@ -17,6 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseUtils;
@@ -27,7 +28,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionResult;
-import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.testutil.BlockTestUtil;
 
 import java.util.EnumMap;

diff --git a/...r/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByNumberIntegrationTest.java b/...r/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByNumberIntegrationTest.java
@@ -17,6 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseUtils;
@@ -27,7 +28,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionResult;
-import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.testutil.BlockTestUtil;
 
 import java.util.EnumMap;

diff --git a/...r/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetFilterChangesIntegrationTest.java b/...r/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetFilterChangesIntegrationTest.java
@@ -24,6 +24,7 @@
 import org.hyperledger.besu.crypto.KeyPair;
 import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
@@ -56,7 +57,6 @@
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
 import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.testutil.TestClock;
 

diff --git a/...ger/besu/ethereum/api/jsonrpc/methods/fork/london/EthGetFilterChangesIntegrationTest.java b/...ger/besu/ethereum/api/jsonrpc/methods/fork/london/EthGetFilterChangesIntegrationTest.java
@@ -24,6 +24,7 @@
 import org.hyperledger.besu.crypto.KeyPair;
 import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
@@ -56,7 +57,6 @@
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
 import org.hyperledger.besu.ethereum.eth.transactions.sorter.BaseFeePendingTransactionsSorter;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.testutil.TestClock;
 

diff --git a/...besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/AbstractEeaSendRawTransaction.java b/...besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/AbstractEeaSendRawTransaction.java
@@ -19,6 +19,7 @@
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.DECODE_ERROR;
 
 import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
@@ -36,7 +37,6 @@
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 import org.hyperledger.besu.ethereum.util.NonceProvider;
-import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
 
 import java.util.Optional;

diff --git a/...org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java b/...org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java
@@ -14,11 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
 
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.evm.AccessListEntry;
-import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.util.List;
 

diff --git a/.../org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java b/.../org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java
@@ -16,11 +16,11 @@
 
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.evm.AccessListEntry;
-import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.util.List;
 

diff --git a/.../org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java b/.../org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java
@@ -16,11 +16,11 @@
 
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.ethereum.api.query.TransactionReceiptWithMetadata;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.evm.log.Log;
-import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...est/java/org/hyperledger/besu/ethereum/api/graphql/AbstractEthGraphQLHttpServiceTest.java b/...est/java/org/hyperledger/besu/ethereum/api/graphql/AbstractEthGraphQLHttpServiceTest.java
@@ -16,6 +16,7 @@
 
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.ImmutableApiConfiguration;
@@ -35,7 +36,6 @@
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.plugin.data.SyncStatus;
-import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.testutil.BlockTestUtil;
 
 import java.util.Collections;

diff --git a/...g/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHashTest.java b/...g/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHashTest.java
@@ -21,6 +21,7 @@
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Transaction;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
@@ -34,7 +35,6 @@
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.plugin.data.Transaction;
 
 import java.util.Optional;
 import java.util.Set;

diff --git a/.../hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java b/.../hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java
@@ -22,6 +22,7 @@
 import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
@@ -40,7 +41,6 @@
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
-import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.math.BigInteger;
 import java.util.Collections;