rebased off of 4844_tx_type

Signed-off-by: Justin Florentine <justin+github@florentine.us>

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java

@@ -303,7 +303,7 @@ public Transaction(
       final Bytes payload,
       final Address sender,
       final Optional<BigInteger> chainId,
-      final Optional<List<Hash>> versionedHashes ) {
+      final Optional<List<Hash>> versionedHashes) {
     this(
         nonce,
         Optional.of(gasPrice),
@@ -768,7 +768,7 @@ private static Bytes32 computeSenderRecoveryHash(
         preimage = frontierPreimage(nonce, gasPrice, gasLimit, to, value, payload, chainId);
         break;
       case EIP1559:
-      case BLOB_TX_TYPE:
+      case EIP4844:
         preimage =
             eip1559Preimage(
                 nonce,
@@ -1074,7 +1074,7 @@ public Builder versionedHashes(final Optional<List<Hash>> versionedHashes) {
 
     public Builder guessType() {
       if (versionedHashes != null && versionedHashes.isPresent()) {
-        transactionType = TransactionType.BLOB_TX_TYPE;
+        transactionType = TransactionType.EIP4844;
       } else if (maxPriorityFeePerGas != null || maxFeePerGas != null) {
         transactionType = TransactionType.EIP1559;
       } else if (accessList.isPresent()) {

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionDecoder.java

@@ -55,9 +55,7 @@ interface Decoder {
           TransactionType.ACCESS_LIST,
           TransactionDecoder::decodeAccessList,
           TransactionType.EIP1559,
-          TransactionDecoder::decodeEIP1559,
-          TransactionType.BLOB_TX_TYPE,
-          TransactionDecoder::decodeEIP4844);
+          TransactionDecoder::decodeEIP1559);
 
   private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
       Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
@@ -217,45 +215,4 @@ static Transaction decodeEIP1559(final RLPInput input) {
     input.leaveList();
     return transaction;
   }
-
-  // TODO: copypasta till SSZ decoder available
-  static Transaction decodeEIP4844(final RLPInput input) {
-    input.enterList();
-    final BigInteger chainId = input.readBigIntegerScalar();
-    final Transaction.Builder builder =
-        Transaction.builder()
-            .type(TransactionType.BLOB_TX_TYPE)
-            .chainId(chainId)
-            .nonce(input.readLongScalar())
-            .maxPriorityFeePerGas(Wei.of(input.readUInt256Scalar()))
-            .maxFeePerGas(Wei.of(input.readUInt256Scalar()))
-            .gasLimit(input.readLongScalar())
-            .to(input.readBytes(v -> v.size() == 0 ? null : Address.wrap(v)))
-            .value(Wei.of(input.readUInt256Scalar()))
-            .payload(input.readBytes())
-            .accessList(
-                input.readList(
-                    accessListEntryRLPInput -> {
-                      accessListEntryRLPInput.enterList();
-                      final AccessListEntry accessListEntry =
-                          new AccessListEntry(
-                              Address.wrap(accessListEntryRLPInput.readBytes()),
-                              accessListEntryRLPInput.readList(RLPInput::readBytes32));
-                      accessListEntryRLPInput.leaveList();
-                      return accessListEntry;
-                    }));
-    final byte recId = (byte) input.readIntScalar();
-    final Transaction transaction =
-        builder
-            .signature(
-                SIGNATURE_ALGORITHM
-                    .get()
-                    .createSignature(
-                        input.readUInt256Scalar().toUnsignedBigInteger(),
-                        input.readUInt256Scalar().toUnsignedBigInteger(),
-                        recId))
-            .build();
-    input.leaveList();
-    return transaction;
-  }
 }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionEncoder.java

@@ -43,8 +43,6 @@ interface Encoder {
           TransactionType.ACCESS_LIST,
           TransactionEncoder::encodeAccessList,
           TransactionType.EIP1559,
-          TransactionEncoder::encodeEIP1559,
-          TransactionType.BLOB_TX_TYPE,
           TransactionEncoder::encodeEIP1559);
 
   public static void encodeForWire(final Transaction transaction, final RLPOutput rlpOutput) {

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java

@@ -380,7 +380,7 @@ public TransactionProcessingResult processTransaction(
                 .contract(contractAddress)
                 .inputData(Bytes.EMPTY)
                 .versionedHashes(
-                    transaction.getType() == TransactionType.BLOB_TX_TYPE
+                    transaction.getType() == TransactionType.EIP4844
                         ? transaction.getVersionedHashes()
                         : Optional.empty())
                 .code(
@@ -398,7 +398,7 @@ public TransactionProcessingResult processTransaction(
                 .contract(to)
                 .inputData(transaction.getPayload())
                 .versionedHashes(
-                    transaction.getType() == TransactionType.BLOB_TX_TYPE
+                    transaction.getType() == TransactionType.EIP4844
                         ? transaction.getVersionedHashes()
                         : Optional.empty())
                 .code(

ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java

@@ -373,8 +373,6 @@ public Transaction transaction(
         return eip1559Transaction(payload, to);
       case ACCESS_LIST:
         return accessListTransaction(payload, to);
-      case BLOB_TX_TYPE:
-        return eip4844Transaction(payload, to);
       default:
         throw new RuntimeException(
             String.format(
@@ -397,22 +395,6 @@ private Transaction accessListTransaction(final Bytes payload, final Address to)
         .signAndBuild(generateKeyPair());
   }
 
-  private Transaction eip4844Transaction(final Bytes payload, final Address to) {
-    return Transaction.builder()
-        .type(TransactionType.BLOB_TX_TYPE)
-        .nonce(random.nextLong())
-        .maxPriorityFeePerGas(Wei.wrap(bytesValue(4)))
-        .maxFeePerGas(Wei.wrap(bytesValue(4)))
-        .gasLimit(positiveLong())
-        .to(to)
-        .value(Wei.wrap(bytes32()))
-        .payload(payload)
-        .chainId(BigInteger.ONE)
-        .versionedHashes(
-            Optional.of(Arrays.asList(Hash.fromHexStringLenient("0xdeadbeefb0b0facecafebabe"))))
-        .signAndBuild(generateKeyPair());
-  }
-
   private List<AccessListEntry> accessList() {
     final List<Address> accessedAddresses =
         Stream.generate(this::address).limit(1L + random.nextInt(3)).collect(toUnmodifiableList());

ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionBuilderTest.java

@@ -18,14 +18,11 @@
 import static java.util.stream.Collectors.toUnmodifiableSet;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.evm.AccessListEntry;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
 
@@ -41,11 +38,9 @@ public void guessTypeCanGuessAllTypes() {
     final Transaction.Builder accessListBuilder =
         Transaction.builder()
             .accessList(List.of(new AccessListEntry(gen.address(), List.of(gen.bytes32()))));
-    final Transaction.Builder eip4844Builder =
-        Transaction.builder().versionedHashes(Optional.of(Arrays.asList(Hash.ZERO)));
 
     final Set<TransactionType> guessedTypes =
-        Stream.of(frontierBuilder, eip1559Builder, accessListBuilder, eip4844Builder)
+        Stream.of(frontierBuilder, eip1559Builder, accessListBuilder)
             .map(transactionBuilder -> transactionBuilder.guessType().getTransactionType())
             .collect(toUnmodifiableSet());
 

evm/src/test/java/org/hyperledger/besu/evm/operations/DataHashOperationTest.java

@@ -28,6 +28,7 @@
 import org.hyperledger.besu.evm.operation.DataHashOperation;
 import org.hyperledger.besu.evm.operation.Operation;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;