Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Add terminal block hash and number to Ropsten genesis file (#4026) #4093

Merged
merged 1 commit into from
Jul 13, 2022
Merged

Revert "Add terminal block hash and number to Ropsten genesis file (#4026) #4093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
4 changes: 2 additions & 2 deletions besu/src/test/java/org/hyperledger/besu/ForkIdsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions config/src/main/resources/ropsten.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
"berlinBlock": 9812189,
"londonBlock": 10499401,
"terminalTotalDifficulty": 50000000000000000,
"terminalBlockHash": "0x5010949c3acdf1d076c9e4ee8aedbb539aca48ebe19638330bc02c5b1bfb953d",
"terminalBlockNumber": 12350712,
"ethash": {
},
"discovery": {
Expand Down