From da861ca1ffe059957aaf35833982f2496bc0aa77 Mon Sep 17 00:00:00 2001
From: Fabio Di Fabio <fabio.difabio@consensys.net>
Date: Wed, 13 Jul 2022 11:12:47 +0200
Subject: [PATCH] Revert "Add terminal block hash and number to Ropsten genesis
 file (#4026)"

This reverts commit 27fc468624d4a19067b076567ea9e1578217d34e.

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
---
 .../besu/controller/BesuControllerBuilder.java      | 13 -------------
 .../test/java/org/hyperledger/besu/ForkIdsTest.java |  4 ++--
 config/src/main/resources/ropsten.json              |  2 --
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
index f74c33db83a..612fb3fdfbd 100644
--- a/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
+++ b/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
@@ -634,19 +634,6 @@ protected List<PeerValidator> createPeerValidators(final ProtocolSchedule protoc
               protocolSchedule, metricsSystem, requiredBlock.getKey(), requiredBlock.getValue()));
     }
 
-    final Optional<Hash> terminalBlockHash = configOptionsSupplier.get().getTerminalBlockHash();
-    if (terminalBlockHash.isPresent() && !terminalBlockHash.get().equals(Hash.ZERO)) {
-      final OptionalLong terminalBlockNumber = configOptionsSupplier.get().getTerminalBlockNumber();
-      if (terminalBlockNumber.isPresent()) {
-        validators.add(
-            new RequiredBlocksPeerValidator(
-                protocolSchedule,
-                metricsSystem,
-                terminalBlockNumber.getAsLong(),
-                terminalBlockHash.get()));
-      }
-    }
-
     final CheckpointConfigOptions checkpointConfigOptions =
         genesisConfig.getConfigOptions(genesisConfigOverrides).getCheckpointOptions();
     if (SyncMode.X_CHECKPOINT.equals(syncConfig.getSyncMode())
diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsTest.java
index cef9a121a7a..98940b4981d 100644
--- a/besu/src/test/java/org/hyperledger/besu/ForkIdsTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/ForkIdsTest.java
@@ -67,8 +67,8 @@ public static Collection<Object[]> parameters() {
               new ForkId(Bytes.ofUnsignedInt(0x4bc66396L), 7117117L),
               new ForkId(Bytes.ofUnsignedInt(0x6727ef90L), 9812189L),
               new ForkId(Bytes.ofUnsignedInt(0xa157d377L), 10499401L),
-              new ForkId(Bytes.ofUnsignedInt(0x7119b6b3L), 12350712L),
-              new ForkId(Bytes.ofUnsignedInt(0xaae42f33L), 0L))
+              new ForkId(Bytes.ofUnsignedInt(0x7119b6b3L), 0L),
+              new ForkId(Bytes.ofUnsignedInt(0x7119b6b3L), 0L))
         },
         new Object[] {
           NetworkName.RINKEBY,
diff --git a/config/src/main/resources/ropsten.json b/config/src/main/resources/ropsten.json
index 3e67901012e..3912705c18e 100644
--- a/config/src/main/resources/ropsten.json
+++ b/config/src/main/resources/ropsten.json
@@ -11,8 +11,6 @@
     "berlinBlock": 9812189,
     "londonBlock": 10499401,
     "terminalTotalDifficulty": 50000000000000000,
-    "terminalBlockHash": "0x5010949c3acdf1d076c9e4ee8aedbb539aca48ebe19638330bc02c5b1bfb953d",
-    "terminalBlockNumber": 12350712,
     "ethash": {
     },
     "discovery": {