Drop "sokol" chain support

.github/workflows/update-poa-bootnodes.yml

@@ -27,12 +27,6 @@ jobs:
         git checkout core
         cd ..
         cat src/Nethermind/Chains/poacore.json | jq ".nodes = $(cat poa-chain-spec/spec.json | jq ".nodes")" > src/Nethermind/Chains/poacore.json 
-    - name: Update Sokol chainspec
-      run: |
-        cd poa-chain-spec/
-        git checkout sokol
-        cd ..
-        cat src/Nethermind/Chains/sokol.json | jq ".nodes = $(cat poa-chain-spec/spec.json | jq ".nodes")" > src/Nethermind/Chains/sokol.json 
     - name: Update xDai chainspec
       run: |
         cd poa-chain-spec/
@@ -48,7 +42,7 @@ jobs:
         commit-message: Update bootnodes
         body: |
           Nethermind bootnodes have been updated.
-          - Files included - poacore.json, sokol.json, xdai.json
+          - Files included - poacore.json, xdai.json
           - Auto-generated by [create-pull-request][1]
 
           [1]: https://github.com/peter-evans/create-pull-request

scripts/syncSettings.py

@@ -54,11 +54,6 @@
         "blockReduced": 1000,
         "multiplierRequirement": 1000
     },
-    "sokol": {
-        "url": "https://sokol.poa.network",
-        "blockReduced": 8192,
-        "multiplierRequirement": 10000
-    },
     "energyweb": {
         "url": "https://rpc.energyweb.org",
         "blockReduced": 8192,

src/Nethermind/Nethermind.Baseline.Test/BaselineConfigTests.cs

@@ -69,9 +69,6 @@ public void Baseline_is_disabled_by_default(string configWildcard, bool enabled)
             "kovan_archive.cfg",
             "mainnet_archive.cfg",
             "mainnet.cfg",
-            "sokol.cfg",
-            "sokol_archive.cfg",
-            "sokol_validator.cfg",
             "poacore.cfg",
             "poacore_archive.cfg",
             "poacore_validator.cfg",

src/Nethermind/Nethermind.Baseline.Test/Nethermind.Baseline.Test.csproj

@@ -114,18 +114,6 @@
         <Link>configs\ropsten_archive.cfg</Link>
 		<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
-      <Content Include="..\Nethermind.Runner\configs\sokol.cfg">
-        <Link>configs\sokol.cfg</Link>
-		<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
-      <Content Include="..\Nethermind.Runner\configs\sokol_archive.cfg">
-        <Link>configs\sokol_archive.cfg</Link>
-		<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
-      <Content Include="..\Nethermind.Runner\configs\sokol_validator.cfg">
-        <Link>configs\sokol_validator.cfg</Link>
-		<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
       <Content Include="..\Nethermind.Runner\configs\spaceneth.cfg">
         <Link>configs\spaceneth.cfg</Link>
 		<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/Nethermind/Nethermind.Config.Test/ConfigFileTestsBase.cs

@@ -61,10 +61,6 @@ protected IEnumerable<string> RopstenConfigs
         protected IEnumerable<string> PoaCoreConfigs
             => Configs.Where(config => config.Contains("poacore"));
 
-        [ConfigFileGroup("sokol")]
-        protected IEnumerable<string> SokolConfigs
-            => Configs.Where(config => config.Contains("sokol"));
-
         [ConfigFileGroup("volta")]
         protected IEnumerable<string> VoltaConfigs
             => Configs.Where(config => config.Contains("volta"));
@@ -112,7 +108,6 @@ protected IEnumerable<string> NdmConfigs
         [ConfigFileGroup("aura")]
         protected IEnumerable<string> AuraConfigs
             => PoaCoreConfigs
-                .Union(SokolConfigs)
                 .Union(XDaiConfigs)
                 .Union(VoltaConfigs)
                 .Union(EnergyConfigs)

src/Nethermind/Nethermind.Core/BlockchainIds.cs

@@ -17,7 +17,6 @@ namespace Nethermind.Core
     /// 8: Ubiq, the public Gubiq main network with flux difficulty chain ID 8
     /// 42: Kovan, the public Parity-only PoA testnet
     /// 60: GoChain, the GoChain networks mainnet
-    /// 77: Sokol, the public POA Network testnet
     /// 99: Core, the public POA Network main network
     /// 100: xDai, the public MakerDAO/POA Network main network
     /// 246: EnergyWeb, the public Energyweb main network

src/Nethermind/Nethermind.Runner.Test/ConfigFilesTests.cs

@@ -78,7 +78,6 @@ public void Networking_is_disabled_when_needed(string configWildcard, bool isEna
         [TestCase("rinkeby", "ws://localhost:3000/api")]
         [TestCase("goerli", "wss://stats.goerli.net/api")]
         [TestCase("mainnet", "wss://ethstats.net/api")]
-        [TestCase("sokol", "ws://localhost:3000/api")]
         [TestCase("poacore", "ws://localhost:3000/api")]
         [TestCase("xdai", "ws://localhost:3000/api")]
         [TestCase("spaceneth", "ws://localhost:3000/api")]
@@ -104,7 +103,6 @@ public void Geth_limits_configs_are_correct(string configWildcard, bool useGethL
         [TestCase("rinkeby", "0x6341fd3daf94b748c72ced5a5b26028f2474f5f00d824504e4fa37a75767e177")]
         [TestCase("goerli", "0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a")]
         [TestCase("mainnet", "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3")]
-        [TestCase("sokol", "0x5b28c1bfd3a15230c9a46b399cd0f9a6920d432e85381cc6a140b06e8410112f")]
         [TestCase("poacore", "0x39f02c003dde5b073b3f6e1700fc0b84b4877f6839bb23edadd3d2d82a488634")]
         [TestCase("xdai", "0x4f1dd23188aab3a76b463e4af801b52b1248ef073c648cbdc4c9333d3da79756")]
         [TestCase("volta", "0xebd8b413ca7b7f84a8dd20d17519ce2b01954c74d94a0a739a3e416abe0e43e5")]
@@ -174,8 +172,6 @@ public void Cache_state_index(string configWildcard, bool expectedValue)
         [TestCase("xdai ^archive", 768000000)]
         [TestCase("poacore archive", 1024000000)]
         [TestCase("poacore ^archive", 768000000)]
-        [TestCase("sokol archive", 768000000)]
-        [TestCase("sokol ^archive", 512000000)]
         [TestCase("spaceneth.cfg", 64000000)]
         [TestCase("spaceneth_persistent.cfg", 128000000)]
         public void Memory_hint_values_are_correct(string configWildcard, long expectedValue)
@@ -213,8 +209,8 @@ public void Network_diag_tracer_disabled_by_default(string configWildcard)
         }
 
         [TestCase("mainnet xdai poacore energy", 2048)]
-        [TestCase("^baseline ^mainnet ^spaceneth ^volta ^energy ^sokol ^poacore ^xdai", 1024)]
-        [TestCase("baseline volta sokol", 512)]
+        [TestCase("^baseline ^mainnet ^spaceneth ^volta ^energy ^poacore ^xdai", 1024)]
+        [TestCase("baseline volta", 512)]
         [TestCase("spaceneth", 128)]
         public void Tx_pool_defaults_are_correct(string configWildcard, int poolSize)
         {
@@ -259,7 +255,6 @@ public void Fast_sync_settings_as_expected(string configWildcard, bool downloadB
         [TestCase("rinkeby.cfg", false)]
         [TestCase("sepolia.cfg", true)]
         [TestCase("xdai.cfg", false)]
-        [TestCase("sokol.cfg", false)]
         public void Snap_sync_settings_as_expected(string configWildcard, bool enabled)
         {
             Test<ISyncConfig, bool>(configWildcard, c => c.SnapSync, enabled);
@@ -326,7 +321,6 @@ public void Clique_pivots_divide_by_30000_epoch_length(string configWildcard)
         [TestCase("goerli", false)]
         [TestCase("mainnet_archive.cfg", true)]
         [TestCase("mainnet.cfg", true)]
-        [TestCase("sokol", false)]
         [TestCase("poacore", true)]
         [TestCase("xdai", true)]
         [TestCase("volta", false)]
@@ -351,9 +345,6 @@ public void Basic_configs_are_as_expected(string configWildcard, bool isProducti
         [TestCase("rinkeby")]
         [TestCase("goerli", new[] { 16, 16, 16, 16 })]
         [TestCase("mainnet")]
-        [TestCase("sokol.cfg", new[] { 16, 16, 16, 16 })]
-        [TestCase("sokol_archive.cfg", new[] { 16, 16, 16, 16 })]
-        [TestCase("sokol_validator.cfg", null, false)]
         [TestCase("poacore.cfg", new[] { 16, 16, 16, 16 })]
         [TestCase("poacore_archive.cfg", new[] { 16, 16, 16, 16 })]
         [TestCase("poacore_validator.cfg", null, false)]
@@ -441,9 +432,6 @@ public void Memory_hint_is_enough(string configWildcard)
             "kovan_archive.cfg",
             "mainnet_archive.cfg",
             "mainnet.cfg",
-            "sokol.cfg",
-            "sokol_archive.cfg",
-            "sokol_validator.cfg",
             "poacore.cfg",
             "poacore_archive.cfg",
             "poacore_validator.cfg",

src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj

@@ -49,9 +49,6 @@
         <Content Include="..\Chains\ropsten.json" CopyToOutputDirectory="PreserveNewest">
             <Link>Chains\ropsten.json</Link>
         </Content>
-        <Content Include="..\Chains\sokol.json" CopyToOutputDirectory="PreserveNewest">
-            <Link>Chains\sokol.json</Link>
-        </Content>
         <Content Include="..\Chains\spaceneth.json" CopyToOutputDirectory="PreserveNewest">
             <Link>Chains\spaceneth.json</Link>
         </Content>

src/Nethermind/Nethermind.Runner/Properties/launchSettings.json

@@ -119,13 +119,6 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "Sokol": {
-      "commandName": "Project",
-      "commandLineArgs": "-c sokol -dd %NETHERMIND_DATA_DIR% --JsonRpc.Enabled true",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "Spaceneth": {
       "commandName": "Project",
       "commandLineArgs": "-c spaceneth -dd %NETHERMIND_DATA_DIR% --JsonRpc.Enabled true",

src/Nethermind/Nethermind.Specs/KnownHashes.cs

@@ -19,8 +19,6 @@ public static class KnownHashes
         public static readonly Keccak RopstenGenesis = new("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d");
         public static readonly Keccak RopstenConstantinopleFix = new("0x8696d2eed8197e186d8d682756a0c2a1947ab5e71257475ebcce4fa3252ee9f7");
 
-        public static readonly Keccak SokolGenesis = new("0x5b28c1bfd3a15230c9a46b399cd0f9a6920d432e85381cc6a140b06e8410112f");
-
         public static readonly Keccak SepoliaGenesis = new("0x25a5cc106eea7138acab33231d7160d69cb777ee0c2c553fcddf5138993e6dd9");
 
         public static readonly Keccak GnosisGenesis = new("0x4f1dd23188aab3a76b463e4af801b52b1248ef073c648cbdc4c9333d3da79756");

src/Nethermind/Nethermind.sln

@@ -53,7 +53,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Chains", "Chains", "{D75E83
 		Chains\poacore.json = Chains\poacore.json
 		Chains\rinkeby.json = Chains\rinkeby.json
 		Chains\ropsten.json = Chains\ropsten.json
-		Chains\sokol.json = Chains\sokol.json
 		Chains\spaceneth.json = Chains\spaceneth.json
 		Chains\volta.json = Chains\volta.json
 		Chains\wit.json = Chains\wit.json