core: remove Rinkeby (#1223)

erigontech · Jun 6, 2023 · 1faf310 · 1faf310
1 parent cfe81da
commit 1faf310
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 1,922 deletions.
diff --git a/silkworm/core/chain/config.cpp b/silkworm/core/chain/config.cpp
@@ -25,7 +25,6 @@ namespace silkworm {
 
 static const std::vector<std::pair<std::string, const ChainConfig*>> kKnownChainConfigs{
     {"mainnet", &kMainnetConfig},
-    {"rinkeby", &kRinkebyConfig},
     {"goerli", &kGoerliConfig},
     {"sepolia", &kSepoliaConfig},
 };

diff --git a/silkworm/core/chain/config.hpp b/silkworm/core/chain/config.hpp
@@ -131,21 +131,6 @@ inline constexpr ChainConfig kMainnetConfig{
     .shanghai_time = 1681338455,
 };
 
-inline constexpr evmc::bytes32 kRinkebyGenesisHash{0x6341fd3daf94b748c72ced5a5b26028f2474f5f00d824504e4fa37a75767e177_bytes32};
-inline constexpr ChainConfig kRinkebyConfig{
-    .chain_id = 4,
-    .protocol_rule_set = protocol::RuleSetType::kClique,
-    .homestead_block = 1,
-    .tangerine_whistle_block = 2,
-    .spurious_dragon_block = 3,
-    .byzantium_block = 1'035'301,
-    .constantinople_block = 3'660'663,
-    .petersburg_block = 4'321'234,
-    .istanbul_block = 5'435'345,
-    .berlin_block = 8'290'928,
-    .london_block = 8'897'988,
-};
-
 inline constexpr evmc::bytes32 kGoerliGenesisHash{0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a_bytes32};
 inline constexpr ChainConfig kGoerliConfig{
     .chain_id = 5,

diff --git a/silkworm/core/chain/config_test.cpp b/silkworm/core/chain/config_test.cpp
@@ -27,12 +27,11 @@ namespace silkworm {
 TEST_CASE("Config lookup") {
     CHECK(lookup_known_chain(0u).has_value() == false);
     CHECK(lookup_known_chain(1u)->second == &kMainnetConfig);
-    CHECK(lookup_known_chain(4u)->second == &kRinkebyConfig);
-    CHECK(lookup_known_chain(5u)->second == &kGoerliConfig);
+    CHECK(lookup_known_chain(kSepoliaConfig.chain_id)->second == &kSepoliaConfig);
     CHECK(lookup_known_chain(12345u).has_value() == false);
     CHECK(lookup_known_chain("mainnet")->second == &kMainnetConfig);
-    CHECK(lookup_known_chain("Rinkeby")->second == &kRinkebyConfig);
     CHECK(lookup_known_chain("goErli")->second == &kGoerliConfig);
+    CHECK(lookup_known_chain("Sepolia")->second == &kSepoliaConfig);
     CHECK(lookup_known_chain("xxxx").has_value() == false);
 
     auto chains_map{get_known_chains_map()};

diff --git a/silkworm/core/chain/genesis.cpp b/silkworm/core/chain/genesis.cpp
@@ -30,9 +30,6 @@ extern size_t sizeof_genesis_mainnet_data();
 extern const char* genesis_goerli_data();
 extern size_t sizeof_genesis_goerli_data();
 
-extern const char* genesis_rinkeby_data();
-extern size_t sizeof_genesis_rinkeby_data();
-
 extern const char* genesis_sepolia_data();
 extern size_t sizeof_genesis_sepolia_data();
 
@@ -43,9 +40,6 @@ std::string read_genesis_data(uint64_t chain_id) {
         case kMainnetConfig.chain_id:
             assert(sizeof_genesis_mainnet_data() != 0);
             return std::string(genesis_mainnet_data(), sizeof_genesis_mainnet_data());
-        case kRinkebyConfig.chain_id:
-            assert(sizeof_genesis_rinkeby_data() != 0);
-            return std::string(genesis_rinkeby_data(), sizeof_genesis_rinkeby_data());
         case kGoerliConfig.chain_id:
             assert(sizeof_genesis_goerli_data() != 0);
             return std::string(genesis_goerli_data(), sizeof_genesis_goerli_data());

diff --git a/silkworm/core/chain/genesis_rinkeby.cpp b/silkworm/core/chain/genesis_rinkeby.cpp