Remove EIP-7742 (#8083)

This EIP was removed and equivalent functionality replaced by EIP-7840.

---

Revert "Rename targetBlobCount to targetBlobsPerBlock (#7981)"

This reverts commit 16713067490dc99ad36b21fa3d85d9dc639030ef.

Revert "EIP-7742: Add target_blob_count to block header (#7808)"

This reverts commit f855d5b72fb5e44977d995f48872cdb976333711.

Signed-off-by: Simon Dudley <[email protected]>

Author: siladu

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java

@@ -58,7 +58,6 @@ public static BlockHeader createBlockHeader(
         null,
         null,
         null,
-        null,
         blockHeaderFunctions);
   }
 }

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEnginePragueAcceptanceTest.java

@@ -20,11 +20,8 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.provider.Arguments;
 
-// TODO SLD
-@Disabled("TODO SLD - Enable when Prague spec is finalized")
 public class ExecutionEnginePragueAcceptanceTest extends AbstractJsonRpcTest {
   private static final String GENESIS_FILE = "/jsonrpc/engine/prague/genesis.json";
   private static final String TEST_CASE_PATH = "/jsonrpc/engine/prague/test-cases/";

besu/src/test/java/org/hyperledger/besu/controller/AbstractBftBesuControllerBuilderTest.java

@@ -195,7 +195,6 @@ public void miningParametersBlockPeriodSecondsIsUpdatedOnTransition() {
             null,
             null,
             null,
-            null,
             getBlockHeaderFunctions());
     final Block block1 = new Block(header1, BlockBody.empty());
 

besu/src/test/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilderTest.java

@@ -224,7 +224,6 @@ public void miningParametersBlockPeriodSecondsIsUpdatedOnTransition() {
             null,
             null,
             null,
-            null,
             new CliqueBlockHeaderFunctions());
     final Block block1 = new Block(header1, BlockBody.empty());
 

besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java

@@ -219,7 +219,7 @@ private void setSyncTarget() {
         mock(EthPeer.class),
         new org.hyperledger.besu.ethereum.core.BlockHeader(
             null, null, null, null, null, null, null, null, 1, 1, 1, 1, null, null, null, 1, null,
-            null, null, null, null, null, null));
+            null, null, null, null, null));
   }
 
   private void clearSyncTarget() {

config/src/main/java/org/hyperledger/besu/config/GenesisConfig.java

@@ -265,17 +265,6 @@ public String getParentBeaconBlockRoot() {
         "0x0000000000000000000000000000000000000000000000000000000000000000");
   }
 
-  /**
-   * Gets target blobs per block.
-   *
-   * @return the target blobs per block
-   */
-  public Optional<String> getTargetBlobsPerBlock() {
-    // TODO SLD EIP-7742 not sure if we should use a default value here or enforce any
-    // "pragueAtGenesis" genesis file (used in devnets) to have this value
-    return JsonUtil.getValueAsString(genesisRoot, "targetblobsperblock");
-  }
-
   /**
    * Gets coinbase.
    *

ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseKey.java

@@ -38,6 +38,5 @@ public enum JsonRpcResponseKey {
   TRANSACTION_ROOT,
   BASEFEE,
   WITHDRAWALS_ROOT,
-  REQUESTS_HASH,
-  TARGET_BLOBS_PER_BLOCK
+  REQUESTS_HASH
 }

ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java

@@ -63,7 +63,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
-import org.apache.tuweni.units.bigints.UInt64;
 
 public class JsonRpcResponseUtils {
 
@@ -107,10 +106,6 @@ public JsonRpcResponse response(
         values.containsKey(WITHDRAWALS_ROOT) ? hash(values.get(WITHDRAWALS_ROOT)) : null;
     final Hash requestsHash =
         values.containsKey(REQUESTS_HASH) ? hash(values.get(REQUESTS_HASH)) : null;
-    final UInt64 targetBlobsPerBlock =
-        values.containsKey(JsonRpcResponseKey.TARGET_BLOBS_PER_BLOCK)
-            ? UInt64.fromHexString(values.get(JsonRpcResponseKey.TARGET_BLOBS_PER_BLOCK))
-            : null;
     final List<JsonNode> ommers = new ArrayList<>();
 
     final BlockHeader header =
@@ -136,7 +131,6 @@ public JsonRpcResponse response(
             null, // ToDo 4844: set with the value of excess_blob_gas field
             null, // TODO 4788: set with the value of the parent beacon block root field
             requestsHash,
-            targetBlobsPerBlock,
             blockHeaderFunctions);
 
     return new JsonRpcSuccessResponse(

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java

@@ -266,7 +266,6 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
                 : BlobGas.fromHexString(blockParam.getExcessBlobGas()),
             maybeParentBeaconBlockRoot.orElse(null),
             maybeRequests.map(BodyValidation::requestsHash).orElse(null),
-            null, // TODO SLD EIP-7742 wiring in future PR
             headerFunctions);
 
     // ensure the block hash matches the blockParam hash

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResult.java

@@ -88,7 +88,6 @@ public class BlockResult implements JsonRpcResult {
   private final String blobGasUsed;
   private final String excessBlobGas;
   private final String parentBeaconBlockRoot;
-  private final String targetBlobsPerBlock;
   private final List<CallProcessingResult> callProcessingResults;
 
   public BlockResult(
@@ -153,7 +152,6 @@ public BlockResult(
     this.excessBlobGas = header.getExcessBlobGas().map(Quantity::create).orElse(null);
     this.parentBeaconBlockRoot =
         header.getParentBeaconBlockRoot().map(Bytes32::toHexString).orElse(null);
-    this.targetBlobsPerBlock = header.getTargetBlobsPerBlock().map(Quantity::create).orElse(null);
   }
 
   @JsonGetter(value = "number")
@@ -292,11 +290,6 @@ public String getParentBeaconBlockRoot() {
     return parentBeaconBlockRoot;
   }
 
-  @JsonGetter(value = "targetBlobsPerBlock")
-  public String getTargetBlobsPerBlock() {
-    return targetBlobsPerBlock;
-  }
-
   @JsonGetter(value = "calls")
   public List<CallProcessingResult> getTransactionProcessingResults() {
     return callProcessingResults;