From 0f44c5f0e36c4499a975275012effbe0818692bb Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Fri, 3 May 2024 17:15:13 +0200 Subject: [PATCH] Remove deprecated Goerli testnet Signed-off-by: Fabio Di Fabio --- CHANGELOG.md | 4 +- .../besu/cli/config/NetworkName.java | 2 - .../besu/ForkIdsNetworkConfigTest.java | 11 - .../hyperledger/besu/cli/BesuCommandTest.java | 37 +- .../cli/NetworkDeprecationMessageTest.java | 2 +- .../besu/cli/config/EthNetworkConfigTest.java | 14 +- .../config/DefaultDiscoveryConfiguration.java | 20 +- config/src/main/resources/goerli.json | 823 ------------------ .../besu/config/GenesisConfigFileTest.java | 10 - .../besu/ethereum/forkid/ForkIdTest.java | 33 - .../besu/ethereum/forkid/ForkIdTestUtil.java | 8 - .../mainnet/MainnetProtocolScheduleTest.java | 20 - 12 files changed, 22 insertions(+), 962 deletions(-) delete mode 100644 config/src/main/resources/goerli.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f64e16851d..2231f016a42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ ### Breaking Changes - RocksDB database metadata format has changed to be more expressive, the migration of an existing metadata file to the new format is automatic at startup. Before performing a downgrade to a previous version it is mandatory to revert to the original format using the subcommand `besu --data-path=/path/to/besu/datadir storage revert-metadata v2-to-v1`. - BFT networks won't start with SNAP or CHECKPOINT sync (previously Besu would start with this config but quietly fail to sync, so it's now more obvious that it won't work) [#6625](https://github.com/hyperledger/besu/pull/6625), [#6667](https://github.com/hyperledger/besu/pull/6667) -- Forest pruning has been removed, it was deprecated since 24.1.0. In case you are still using it you must now remove any of the following options: `pruning-enabled`, `pruning-blocks-retained` and `pruning-block-confirmations`, from your configuration, and you may want to consider switching to Bonsai. +- Forest pruning has been removed, it was deprecated since 24.1.0. In case you are still using it you must now remove any of the following options: `pruning-enabled`, `pruning-blocks-retained` and `pruning-block-confirmations`, from your configuration, and you may want to consider switching to Bonsai. +- Deprecated Goerli testnet has been removed. ### Upcoming Breaking Changes - Receipt compaction will be enabled by default in a future version of Besu. After this change it will not be possible to downgrade to the previous Besu version. @@ -45,6 +46,7 @@ - Allow users to specify which plugins are registered [#6700](https://github.com/hyperledger/besu/pull/6700) - Layered txpool tuning for blob transactions [#6940](https://github.com/hyperledger/besu/pull/6940) - Update Gradle to 7.6.4 [#7030](https://github.com/hyperledger/besu/pull/7030) +- Remove deprecated Goerli testnet [#7049](https://github.com/hyperledger/besu/pull/7049) ### Bug fixes - Fix txpool dump/restore race condition [#6665](https://github.com/hyperledger/besu/pull/6665) diff --git a/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java b/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java index 39a80df6952..bd41015a7a1 100644 --- a/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java @@ -26,8 +26,6 @@ public enum NetworkName { MAINNET("/mainnet.json", BigInteger.valueOf(1)), /** Sepolia network name. */ SEPOLIA("/sepolia.json", BigInteger.valueOf(11155111)), - /** Goerli network name. */ - GOERLI("/goerli.json", BigInteger.valueOf(5)), /** Holešky network name. */ HOLESKY("/holesky.json", BigInteger.valueOf(17000)), diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java index 46d792f34ee..7d7c6391ff8 100644 --- a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java +++ b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java @@ -78,17 +78,6 @@ public static Collection parameters() { new ForkId(Bytes.ofUnsignedInt(0x9b192ad0L), 0L), new ForkId(Bytes.ofUnsignedInt(0x9b192ad0L), 0L)) }, - new Object[] { - NetworkName.GOERLI, - List.of( - new ForkId(Bytes.ofUnsignedInt(0xa3f5ab08L), 1561651L), - new ForkId(Bytes.ofUnsignedInt(0xc25efa5cL), 4460644L), - new ForkId(Bytes.ofUnsignedInt(0x757a1c47L), 5062605L), - new ForkId(Bytes.ofUnsignedInt(0xb8c6299dL), 1678832736L), - new ForkId(Bytes.ofUnsignedInt(0xf9843abfL), 1705473120), - new ForkId(Bytes.ofUnsignedInt(0x70cc14e2L), 0L), - new ForkId(Bytes.ofUnsignedInt(0x70cc14e2L), 0L)) - }, new Object[] { NetworkName.MAINNET, List.of( diff --git a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java index 4353fd7d5fe..30d7aa0deaf 100644 --- a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java @@ -21,16 +21,15 @@ import static org.hyperledger.besu.cli.config.NetworkName.DEV; import static org.hyperledger.besu.cli.config.NetworkName.EXPERIMENTAL_EIPS; import static org.hyperledger.besu.cli.config.NetworkName.FUTURE_EIPS; -import static org.hyperledger.besu.cli.config.NetworkName.GOERLI; import static org.hyperledger.besu.cli.config.NetworkName.HOLESKY; import static org.hyperledger.besu.cli.config.NetworkName.MAINNET; import static org.hyperledger.besu.cli.config.NetworkName.MORDOR; import static org.hyperledger.besu.cli.config.NetworkName.SEPOLIA; import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.ENGINE; -import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.GOERLI_BOOTSTRAP_NODES; -import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.GOERLI_DISCOVERY_URL; import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES; import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.MAINNET_DISCOVERY_URL; +import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.SEPOLIA_BOOTSTRAP_NODES; +import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.SEPOLIA_DISCOVERY_URL; import static org.hyperledger.besu.plugin.services.storage.DataStorageFormat.BONSAI; import static org.junit.Assume.assumeThat; import static org.mockito.ArgumentMatchers.any; @@ -456,19 +455,19 @@ public void testGenesisPathMainnetEthConfig() { } @Test - public void testGenesisPathGoerliEthConfig() { + public void testGenesisPathSepoliaEthConfig() { final ArgumentCaptor networkArg = ArgumentCaptor.forClass(EthNetworkConfig.class); - parseCommand("--network", "goerli"); + parseCommand("--network", "sepolia"); verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any()); verify(mockControllerBuilder).build(); final EthNetworkConfig config = networkArg.getValue(); - assertThat(config.bootNodes()).isEqualTo(GOERLI_BOOTSTRAP_NODES); - assertThat(config.dnsDiscoveryUrl()).isEqualTo(GOERLI_DISCOVERY_URL); - assertThat(config.networkId()).isEqualTo(BigInteger.valueOf(5)); + assertThat(config.bootNodes()).isEqualTo(SEPOLIA_BOOTSTRAP_NODES); + assertThat(config.dnsDiscoveryUrl()).isEqualTo(SEPOLIA_DISCOVERY_URL); + assertThat(config.networkId()).isEqualTo(BigInteger.valueOf(11155111)); } @Test @@ -1628,24 +1627,6 @@ public void devModeOptionMustBeUsed() { assertThat(commandErrorOutput.toString(UTF_8)).isEmpty(); } - @Test - public void goerliValuesAreUsed() { - parseCommand("--network", "goerli"); - - final ArgumentCaptor networkArg = - ArgumentCaptor.forClass(EthNetworkConfig.class); - - verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any()); - verify(mockControllerBuilder).build(); - - assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(GOERLI)); - - assertThat(commandOutput.toString(UTF_8)).isEmpty(); - assertThat(commandErrorOutput.toString(UTF_8)).isEmpty(); - - verify(mockLogger, never()).warn(contains("Goerli is deprecated and will be shutdown")); - } - @Test public void futureEipsValuesAreUsed() { parseCommand("--network", "future_eips"); @@ -1748,8 +1729,8 @@ public void mordorValuesAreUsed() { } @Test - public void goerliValuesCanBeOverridden() { - networkValuesCanBeOverridden("goerli"); + public void sepoliaValuesCanBeOverridden() { + networkValuesCanBeOverridden("sepolia"); } @Test diff --git a/besu/src/test/java/org/hyperledger/besu/cli/NetworkDeprecationMessageTest.java b/besu/src/test/java/org/hyperledger/besu/cli/NetworkDeprecationMessageTest.java index fb4d51e09d8..9a8fb427491 100644 --- a/besu/src/test/java/org/hyperledger/besu/cli/NetworkDeprecationMessageTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/NetworkDeprecationMessageTest.java @@ -39,7 +39,7 @@ void shouldGenerateDeprecationMessageForDeprecatedNetworks(final NetworkName net @EnumSource( value = NetworkName.class, names = { - "MAINNET", "SEPOLIA", "GOERLI", "DEV", "CLASSIC", "MORDOR", "HOLESKY", + "MAINNET", "SEPOLIA", "DEV", "CLASSIC", "MORDOR", "HOLESKY", }) void shouldThrowErrorForNonDeprecatedNetworks(final NetworkName network) { assertThatThrownBy(() -> NetworkDeprecationMessage.generate(network)) diff --git a/besu/src/test/java/org/hyperledger/besu/cli/config/EthNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/cli/config/EthNetworkConfigTest.java index 75a1bc698ce..3af43eb4e5f 100644 --- a/besu/src/test/java/org/hyperledger/besu/cli/config/EthNetworkConfigTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/config/EthNetworkConfigTest.java @@ -16,10 +16,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hyperledger.besu.cli.config.NetworkName.MAINNET; -import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.GOERLI_BOOTSTRAP_NODES; -import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.GOERLI_DISCOVERY_URL; import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES; import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.MAINNET_DISCOVERY_URL; +import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.SEPOLIA_BOOTSTRAP_NODES; +import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.SEPOLIA_DISCOVERY_URL; import org.hyperledger.besu.config.GenesisConfigFile; @@ -41,11 +41,11 @@ public void testDefaultMainnetConfig() { } @Test - public void testDefaultGoerliConfig() { - EthNetworkConfig config = EthNetworkConfig.getNetworkConfig(NetworkName.GOERLI); - assertThat(config.dnsDiscoveryUrl()).isEqualTo(GOERLI_DISCOVERY_URL); - assertThat(config.bootNodes()).isEqualTo(GOERLI_BOOTSTRAP_NODES); - assertThat(config.networkId()).isEqualTo(BigInteger.valueOf(5)); + public void testDefaultSepoliaConfig() { + EthNetworkConfig config = EthNetworkConfig.getNetworkConfig(NetworkName.SEPOLIA); + assertThat(config.dnsDiscoveryUrl()).isEqualTo(SEPOLIA_DISCOVERY_URL); + assertThat(config.bootNodes()).isEqualTo(SEPOLIA_BOOTSTRAP_NODES); + assertThat(config.networkId()).isEqualTo(BigInteger.valueOf(11155111)); } @Test diff --git a/besu/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DefaultDiscoveryConfiguration.java b/besu/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DefaultDiscoveryConfiguration.java index a5b4f965001..2c3b33bb37a 100644 --- a/besu/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DefaultDiscoveryConfiguration.java +++ b/besu/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DefaultDiscoveryConfiguration.java @@ -24,8 +24,8 @@ import java.util.stream.Stream; public class DefaultDiscoveryConfiguration { - public static final String GOERLI_DISCOVERY_URL = - "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.goerli.ethdisco.net"; + public static final String SEPOLIA_DISCOVERY_URL = + "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.sepolia.ethdisco.net"; public static final String MAINNET_DISCOVERY_URL = "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.mainnet.ethdisco.net"; @@ -40,22 +40,6 @@ public class DefaultDiscoveryConfiguration { ) .map(EnodeURLImpl::fromString) .collect(toList())); - public static final List GOERLI_BOOTSTRAP_NODES = - Collections.unmodifiableList( - Stream.of( - "enode://011f758e6552d105183b1761c5e2dea0111bc20fd5f6422bc7f91e0fabbec9a6595caf6239b37feb773dddd3f87240d99d859431891e4a642cf2a0a9e6cbb98a@51.141.78.53:30303", - "enode://176b9417f511d05b6b2cf3e34b756cf0a7096b3094572a8f6ef4cdcb9d1f9d00683bf0f83347eebdf3b81c3521c2332086d9592802230bf528eaf606a1d9677b@13.93.54.137:30303", - "enode://46add44b9f13965f7b9875ac6b85f016f341012d84f975377573800a863526f4da19ae2c620ec73d11591fa9510e992ecc03ad0751f53cc02f7c7ed6d55c7291@94.237.54.114:30313", - "enode://b5948a2d3e9d486c4d75bf32713221c2bd6cf86463302339299bd227dc2e276cd5a1c7ca4f43a0e9122fe9af884efed563bd2a1fd28661f3b5f5ad7bf1de5949@18.218.250.66:30303", - - // Ethereum Foundation bootnode - "enode://a61215641fb8714a373c80edbfa0ea8878243193f57c96eeb44d0bc019ef295abd4e044fd619bfc4c59731a73fb79afe84e9ab6da0c743ceb479cbb6d263fa91@3.11.147.67:30303", - - // Goerli Initiative bootnodes - "enode://d4f764a48ec2a8ecf883735776fdefe0a3949eb0ca476bd7bc8d0954a9defe8fea15ae5da7d40b5d2d59ce9524a99daedadf6da6283fca492cc80b53689fb3b3@46.4.99.122:32109", - "enode://d2b720352e8216c9efc470091aa91ddafc53e222b32780f505c817ceef69e01d5b0b0797b69db254c586f493872352f5a022b4d8479a00fc92ec55f9ad46a27e@88.99.70.182:30303") - .map(EnodeURLImpl::fromString) - .collect(toList())); public static final List SEPOLIA_BOOTSTRAP_NODES = Collections.unmodifiableList( Stream.of( diff --git a/config/src/main/resources/goerli.json b/config/src/main/resources/goerli.json deleted file mode 100644 index 08ca292794a..00000000000 --- a/config/src/main/resources/goerli.json +++ /dev/null @@ -1,823 +0,0 @@ -{ - "config":{ - "chainId":5, - "petersburgBlock":0, - "istanbulBlock":1561651, - "berlinBlock":4460644, - "londonBlock":5062605, - "terminalTotalDifficulty": 10790000, - "shanghaiTime": 1678832736, - "cancunTime": 1705473120, - "clique":{ - "blockperiodseconds":15, - "epochlength":30000 - }, - "discovery": { - "dns": "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.goerli.ethdisco.net", - "bootnodes": [ - "enode://011f758e6552d105183b1761c5e2dea0111bc20fd5f6422bc7f91e0fabbec9a6595caf6239b37feb773dddd3f87240d99d859431891e4a642cf2a0a9e6cbb98a@51.141.78.53:30303", - "enode://176b9417f511d05b6b2cf3e34b756cf0a7096b3094572a8f6ef4cdcb9d1f9d00683bf0f83347eebdf3b81c3521c2332086d9592802230bf528eaf606a1d9677b@13.93.54.137:30303", - "enode://46add44b9f13965f7b9875ac6b85f016f341012d84f975377573800a863526f4da19ae2c620ec73d11591fa9510e992ecc03ad0751f53cc02f7c7ed6d55c7291@94.237.54.114:30313", - "enode://b5948a2d3e9d486c4d75bf32713221c2bd6cf86463302339299bd227dc2e276cd5a1c7ca4f43a0e9122fe9af884efed563bd2a1fd28661f3b5f5ad7bf1de5949@18.218.250.66:30303", - "enode://a61215641fb8714a373c80edbfa0ea8878243193f57c96eeb44d0bc019ef295abd4e044fd619bfc4c59731a73fb79afe84e9ab6da0c743ceb479cbb6d263fa91@3.11.147.67:30303", - "enode://d4f764a48ec2a8ecf883735776fdefe0a3949eb0ca476bd7bc8d0954a9defe8fea15ae5da7d40b5d2d59ce9524a99daedadf6da6283fca492cc80b53689fb3b3@46.4.99.122:32109", - "enode://d2b720352e8216c9efc470091aa91ddafc53e222b32780f505c817ceef69e01d5b0b0797b69db254c586f493872352f5a022b4d8479a00fc92ec55f9ad46a27e@88.99.70.182:30303" - ] - }, - "checkpoint": { - "hash": "0x50e55c39a725f062af438c5332a5c5bec9a36d02c829ee6ac2cc27d1db719446", - "number": 4350000, - "totalDifficulty": "0x61DBBF", - "_comment": "must be the beginning of a clique epoch" - } - }, - "coinbase":"0x0000000000000000000000000000000000000000", - "difficulty":"0x1", - "extraData":"0x22466c6578692069732061207468696e6722202d204166726900000000000000e0a2bd4258d2768837baa26a28fe71dc079f84c70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "gasLimit":"0xa00000", - "mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000", - "nonce":"0x0", - "timestamp":"0x5c51a607", - "alloc":{ - "0000000000000000000000000000000000000000":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000001":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000002":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000003":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000004":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000005":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000006":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000007":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000008":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000009":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000000a":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000000b":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000000c":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000000d":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000000e":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000000f":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000010":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000011":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000012":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000013":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000014":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000015":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000016":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000017":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000018":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000019":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000001a":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000001b":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000001c":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000001d":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000001e":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000001f":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000020":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000021":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000022":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000023":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000024":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000025":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000026":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000027":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000028":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000029":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000002a":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000002b":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000002c":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000002d":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000002e":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000002f":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000030":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000031":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000032":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000033":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000034":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000035":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000036":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000037":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000038":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000039":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000003a":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000003b":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000003c":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000003d":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000003e":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000003f":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000040":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000041":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000042":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000043":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000044":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000045":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000046":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000047":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000048":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000049":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000004a":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000004b":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000004c":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000004d":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000004e":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000004f":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000050":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000051":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000052":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000053":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000054":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000055":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000056":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000057":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000058":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000059":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000005a":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000005b":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000005c":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000005d":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000005e":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000005f":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000060":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000061":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000062":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000063":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000064":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000065":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000066":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000067":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000068":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000069":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000006a":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000006b":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000006c":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000006d":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000006e":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000006f":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000070":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000071":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000072":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000073":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000074":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000075":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000076":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000077":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000078":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000079":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000007a":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000007b":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000007c":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000007d":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000007e":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000007f":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000080":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000081":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000082":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000083":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000084":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000085":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000086":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000087":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000088":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000089":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000008a":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000008b":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000008c":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000008d":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000008e":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000008f":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000090":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000091":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000092":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000093":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000094":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000095":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000096":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000097":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000098":{ - "balance":"0x1" - }, - "0000000000000000000000000000000000000099":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000009a":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000009b":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000009c":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000009d":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000009e":{ - "balance":"0x1" - }, - "000000000000000000000000000000000000009f":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000a0":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000a1":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000a2":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000a3":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000a4":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000a5":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000a6":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000a7":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000a8":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000a9":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000aa":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000ab":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000ac":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000ad":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000ae":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000af":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000b0":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000b1":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000b2":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000b3":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000b4":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000b5":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000b6":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000b7":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000b8":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000b9":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000ba":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000bb":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000bc":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000bd":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000be":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000bf":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000c0":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000c1":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000c2":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000c3":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000c4":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000c5":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000c6":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000c7":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000c8":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000c9":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000ca":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000cb":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000cc":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000cd":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000ce":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000cf":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000d0":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000d1":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000d2":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000d3":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000d4":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000d5":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000d6":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000d7":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000d8":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000d9":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000da":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000db":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000dc":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000dd":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000de":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000df":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000e0":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000e1":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000e2":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000e3":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000e4":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000e5":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000e6":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000e7":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000e8":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000e9":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000ea":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000eb":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000ec":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000ed":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000ee":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000ef":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000f0":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000f1":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000f2":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000f3":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000f4":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000f5":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000f6":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000f7":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000f8":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000f9":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000fa":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000fb":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000fc":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000fd":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000fe":{ - "balance":"0x1" - }, - "00000000000000000000000000000000000000ff":{ - "balance":"0x1" - }, - "4c2ae482593505f0163cdefc073e81c63cda4107": { - "balance": "0x152d02c7e14af6800000" - }, - "a8e8f14732658e4b51e8711931053a8a69baf2b1": { - "balance": "0x152d02c7e14af6800000" - }, - "d9a5179f091d85051d3c982785efd1455cec8699": { - "balance": "0x84595161401484a000000" - }, - "e0a2bd4258d2768837baa26a28fe71dc079f84c7": { - "balance": "0x4a47e3c12448f4ad000000" - } - } -} diff --git a/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java index 7e863b024dc..2605f0d5e89 100644 --- a/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java +++ b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java @@ -205,16 +205,6 @@ void assertSepoliaTerminalTotalDifficulty() { .contains(UInt256.valueOf(new BigInteger("17000000000000000"))); } - @Test - void assertGoerliTerminalTotalDifficulty() { - GenesisConfigOptions goerliOptions = - GenesisConfigFile.fromResource("/goerli.json").getConfigOptions(); - - assertThat(goerliOptions.getTerminalTotalDifficulty()).isPresent(); - assertThat(goerliOptions.getTerminalTotalDifficulty()) - .contains(UInt256.valueOf(new BigInteger("10790000"))); - } - @Test void assertMainnetTerminalTotalDifficulty() { GenesisConfigOptions mainnetOptions = diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTest.java index c9c727286cd..e3a4c272bd4 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTest.java @@ -297,39 +297,6 @@ public static Stream data() { ForkIdTestUtil.wantForkId("0xf7f9bc08", 0L), Optional.of(ForkIds.SEPOLIA), empty()), - // goerli - Arguments.of( - "Goerli // Unsynced, last Frontier, Homestead, Tangerine, Spurious, Byzantium, Constantinople and first Petersburg block", - Network.GOERLI, - 0L, - 0L, - ForkIdTestUtil.wantForkId("0xa3f5ab08", 1561651L), - Optional.of(ForkIds.GOERLI), - empty()), - Arguments.of( - "Goerli // Last Petersburg block", - Network.GOERLI, - 1561650L, - 0L, - ForkIdTestUtil.wantForkId("0xa3f5ab08", 1561651L), - Optional.of(ForkIds.GOERLI), - empty()), - Arguments.of( - "Goerli // First Istanbul block", - Network.GOERLI, - 1561651L, - 0L, - ForkIdTestUtil.wantForkId("0xc25efa5c", 0L), - Optional.of(ForkIds.GOERLI), - empty()), - Arguments.of( - "Goerli // Future Istanbul block", - Network.GOERLI, - 2000000L, - 0L, - ForkIdTestUtil.wantForkId("0xc25efa5c", 0L), - Optional.of(ForkIds.GOERLI), - empty()), // private Arguments.of( "Private // Unsynced", diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTestUtil.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTestUtil.java index 7fc23c2d475..d165074c3d2 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTestUtil.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTestUtil.java @@ -64,8 +64,6 @@ public static class GenesisHash { "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3"; public static final String SEPOLIA = "0x25a5cc106eea7138acab33231d7160d69cb777ee0c2c553fcddf5138993e6dd9"; - public static final String GOERLI = - "0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a"; public static final String PRIVATE = "0x0000000000000000000000000000000000000000000000000000000000000000"; } @@ -80,7 +78,6 @@ public static class Forks { public static final List SEPOLIA_TIMESTAMPS = Arrays.asList(1677557088L); - public static final List GOERLI = Arrays.asList(0L, 0L, 0L, 0L, 0L, 0L, 0L, 1561651L); public static final List PRIVATE = Arrays.asList(0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L); public static final List MAINNET_WITH_SHANGHAI_BLOCKS = @@ -111,10 +108,6 @@ public static class ForkIds { new ForkId(Bytes.fromHexString("0xfe3366e7"), 1735371L), new ForkId(Bytes.fromHexString("0xb96cbd13"), 1677557088L), new ForkId(Bytes.fromHexString("0xf7f9bc08"), 0L)); // First Shanghai block (timestamp) - public static final List GOERLI = - Arrays.asList( - new ForkId(Bytes.fromHexString("0xa3f5ab08"), 1561651L), - new ForkId(Bytes.fromHexString("0xc25efa5c"), 0L)); public static final List WITHDRAWALS = Arrays.asList( @@ -141,7 +134,6 @@ public static class Network { public static final Network MAINNET = network(GenesisHash.MAINNET, Forks.MAINNET, emptyList()); public static final Network SEPOLIA = network(GenesisHash.SEPOLIA, Forks.SEPOLIA_BLOCKNUMBERS, Forks.SEPOLIA_TIMESTAMPS); - public static final Network GOERLI = network(GenesisHash.GOERLI, Forks.GOERLI, emptyList()); public static final Network PRIVATE = network(GenesisHash.PRIVATE, Forks.PRIVATE, emptyList()); public static final Network MAINNET_WITH_SHANGHAI = diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java index 77c8714217d..fa8cda5cffc 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java @@ -123,26 +123,6 @@ public void outOfOrderConstantinoplesFail() { new BadBlockManager())); } - @Test - public void shouldCreateGoerliConfig() { - final ProtocolSchedule sched = - MainnetProtocolSchedule.fromConfig( - GenesisConfigFile.fromResource("/goerli.json").getConfigOptions(), - EvmConfiguration.DEFAULT, - MiningParameters.MINING_DISABLED, - new BadBlockManager()); - Assertions.assertThat(sched.getByBlockHeader(blockHeader(0L)).getName()) - .isEqualTo("Petersburg"); - Assertions.assertThat(sched.getByBlockHeader(blockHeader(1_561_651L)).getName()) - .isEqualTo("Istanbul"); - Assertions.assertThat(sched.getByBlockHeader(blockHeader(4_460_644L)).getName()) - .isEqualTo("Berlin"); - Assertions.assertThat(sched.getByBlockHeader(blockHeader(5_062_605L)).getName()) - .isEqualTo("London"); - Assertions.assertThat(sched.getByBlockHeader(blockHeader(Long.MAX_VALUE)).getName()) - .isEqualTo("London"); - } - private BlockHeader blockHeader(final long number) { return new BlockHeaderTestFixture().number(number).buildHeader(); }