Merge branch 'master' into fix/filter-empty-modules

NethermindEth · Dec 12, 2024 · b8c2147 · b8c2147
2 parents 1339b8e + 7361b13
commit b8c2147
Show file tree

Hide file tree

Showing 47 changed files with 450 additions and 284 deletions.
diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
@@ -60,7 +60,7 @@ jobs:
     needs: publish-ppa
     steps:
       - name: Wait for PPA package to be published
-        run: sleep 1.5h
+        run: sleep 2h
       - name: Install PPA dependencies
         run: |
           sudo apt-get update

diff --git a/.github/workflows/sync-supported-chains.yml b/.github/workflows/sync-supported-chains.yml
@@ -3,9 +3,13 @@ name: Sync Supported Chains
 on:
   workflow_run:
     workflows: ["Publish Docker image"]
-    branches: [master, release/*]
+    branches: [release/*]
     types:
       - completed
+
+  schedule:
+    - cron: "0 0 * * *"
+
   workflow_dispatch:
     inputs:
       nethermind_image:

diff --git a/src/Nethermind/Directory.Build.props b/src/Nethermind/Directory.Build.props
@@ -15,7 +15,7 @@
     <Copyright>Demerzel Solutions Limited</Copyright>
     <Product>Nethermind</Product>
     <SourceRevisionId Condition="'$(Commit)' != ''">$(Commit)</SourceRevisionId>
-    <VersionPrefix>1.30.0</VersionPrefix>
+    <VersionPrefix>1.31.0</VersionPrefix>
     <VersionSuffix>unstable</VersionSuffix>
   </PropertyGroup>
 

diff --git a/src/Nethermind/Ethereum.Test.Base/JsonToEthereumTest.cs b/src/Nethermind/Ethereum.Test.Base/JsonToEthereumTest.cs
@@ -323,7 +323,6 @@ public static IEnumerable<GeneralStateTest> Convert(string json)
             List<GeneralStateTest> tests = new();
             foreach (KeyValuePair<string, GeneralStateTestJson> namedTest in testsInFile)
             {
-                Console.WriteLine($"Loading {namedTest.Key}\n {namedTest.Value.Post}");
                 tests.AddRange(Convert(namedTest.Key, namedTest.Value));
             }
 

diff --git a/src/Nethermind/Nethermind.Blockchain/Find/BlockParameter.cs b/src/Nethermind/Nethermind.Blockchain/Find/BlockParameter.cs
@@ -300,15 +300,15 @@ public static BlockParameter GetBlockParameter(string? value)
             {
                 case null:
                 case { } empty when string.IsNullOrWhiteSpace(empty):
-                case { } latest when latest.Equals("latest", StringComparison.InvariantCultureIgnoreCase):
+                case { } latest when latest.Equals("latest", StringComparison.OrdinalIgnoreCase):
                     return BlockParameter.Latest;
-                case { } earliest when earliest.Equals("earliest", StringComparison.InvariantCultureIgnoreCase):
+                case { } earliest when earliest.Equals("earliest", StringComparison.OrdinalIgnoreCase):
                     return BlockParameter.Earliest;
-                case { } pending when pending.Equals("pending", StringComparison.InvariantCultureIgnoreCase):
+                case { } pending when pending.Equals("pending", StringComparison.OrdinalIgnoreCase):
                     return BlockParameter.Pending;
-                case { } finalized when finalized.Equals("finalized", StringComparison.InvariantCultureIgnoreCase):
+                case { } finalized when finalized.Equals("finalized", StringComparison.OrdinalIgnoreCase):
                     return BlockParameter.Finalized;
-                case { } safe when safe.Equals("safe", StringComparison.InvariantCultureIgnoreCase):
+                case { } safe when safe.Equals("safe", StringComparison.OrdinalIgnoreCase):
                     return BlockParameter.Safe;
                 case { Length: 66 } hash when hash.StartsWith("0x"):
                     return new BlockParameter(new Hash256(hash));

diff --git a/src/Nethermind/Nethermind.Config/ConfigProvider.cs b/src/Nethermind/Nethermind.Config/ConfigProvider.cs
@@ -53,7 +53,7 @@ public object GetRawValue(string category, string name)
 
         return Categories.TryGetValue(category, out object value) ? value.GetType()
             .GetProperties(BindingFlags.Instance | BindingFlags.Public)
-            .SingleOrDefault(p => string.Equals(p.Name, name, StringComparison.InvariantCultureIgnoreCase))
+            .SingleOrDefault(p => string.Equals(p.Name, name, StringComparison.OrdinalIgnoreCase))
             ?.GetValue(value) : null;
     }
 

diff --git a/src/Nethermind/Nethermind.Config/ConfigSourceHelper.cs b/src/Nethermind/Nethermind.Config/ConfigSourceHelper.cs
@@ -99,7 +99,7 @@ public static object ParseValue(Type valueType, string valueString, string categ
         }
 
         private static bool IsNullString(string valueString) =>
-            string.IsNullOrEmpty(valueString) || valueString.Equals("null", StringComparison.InvariantCultureIgnoreCase);
+            string.IsNullOrEmpty(valueString) || valueString.Equals("null", StringComparison.OrdinalIgnoreCase);
 
         public static object GetDefault(Type type) => type.IsValueType ? (false, Activator.CreateInstance(type)) : (false, null);
 

diff --git a/src/Nethermind/Nethermind.Consensus.Ethash/Ethash.cs b/src/Nethermind/Nethermind.Consensus.Ethash/Ethash.cs
@@ -247,7 +247,15 @@ private IEthashDataSet BuildCache(uint epoch)
             _cacheStopwatch.Restart();
             IEthashDataSet dataSet = new EthashCache(cacheSize, seed.Bytes);
             _cacheStopwatch.Stop();
-            if (_logger.IsInfo) _logger.Info($"Cache for epoch {epoch} with size {cacheSize} and seed {seed.Bytes.ToHexString()} built in {_cacheStopwatch.ElapsedMilliseconds}ms");
+            if (_logger.IsInfo)
+            {
+                var seedText = seed.Bytes.ToHexString(withZeroX: true);
+                if (seedText.Length > 17)
+                {
+                    seedText = $"{seedText[..8]}...{seedText[^6..]}";
+                }
+                _logger.Info($"Cache for epoch {epoch} with size {cacheSize} and seed {seedText} built in {_cacheStopwatch.ElapsedMilliseconds}ms");
+            }
             return dataSet;
         }
 

diff --git a/src/Nethermind/Nethermind.Consensus/Processing/BlockExtensions.cs b/src/Nethermind/Nethermind.Consensus/Processing/BlockExtensions.cs
@@ -40,7 +40,7 @@ public static bool TrySetTransactions(this Block block, Transaction[] transactio
         public static bool IsByNethermindNode(this BlockHeader block) =>
             Ascii.IsValid(block.ExtraData)
             && Encoding.ASCII.GetString(block.ExtraData ?? [])
-                .Contains(BlocksConfig.DefaultExtraData, StringComparison.InvariantCultureIgnoreCase);
+                .Contains(BlocksConfig.DefaultExtraData, StringComparison.OrdinalIgnoreCase);
 
         public static string ParsedExtraData(this Block block)
         {