Merge branch 'master' into fix/mechanism-for-eip-dependent-params

src/Nethermind/Directory.Packages.props

@@ -51,6 +51,7 @@
     <PackageVersion Include="Nethermind.Crypto.Bls" Version="1.0.4" />
     <PackageVersion Include="Nethermind.Crypto.Pairings" Version="1.1.1" />
     <PackageVersion Include="Nethermind.Crypto.SecP256k1" Version="1.4.0" />
+    <PackageVersion Include="Nethermind.Crypto.SecP256r1" Version="1.0.0-preview.1" />
     <PackageVersion Include="Nethermind.DotNetty.Buffers" Version="1.0.1" />
     <PackageVersion Include="Nethermind.DotNetty.Handlers" Version="1.0.1" />
     <PackageVersion Include="Nethermind.DotNetty.Transport" Version="1.0.1" />

src/Nethermind/Nethermind.Api/Extensions/IConsensusPlugin.cs

@@ -9,13 +9,11 @@
 
 namespace Nethermind.Api.Extensions
 {
-    public interface IConsensusPlugin : INethermindPlugin, IBlockProducerFactory
+    public interface IConsensusPlugin : INethermindPlugin, IBlockProducerFactory, IBlockProducerRunnerFactory
     {
         string SealEngineType { get; }
 
         INethermindApi CreateApi(IConfigProvider configProvider, IJsonSerializer jsonSerializer,
             ILogManager logManager, ChainSpec chainSpec) => new NethermindApi(configProvider, jsonSerializer, logManager, chainSpec);
-
-        IBlockProducerRunner CreateBlockProducerRunner();
     }
 }

src/Nethermind/Nethermind.Api/Extensions/IConsensusWrapperPlugin.cs

@@ -10,7 +10,15 @@ public interface IConsensusWrapperPlugin : INethermindPlugin
     {
         IBlockProducer InitBlockProducer(IBlockProducerFactory baseBlockProducerFactory, ITxSource? txSource);
 
-        IBlockProducerRunner InitBlockProducerRunner(IBlockProducerRunner baseRunner) => baseRunner;
+        /// <summary>
+        /// Initializes the <see cref="IBlockProducerRunner"/>.
+        /// </summary>
+        /// <remarks>
+        /// BE CAREFUL IF MORE THAN ONE <see cref="IConsensusWrapperPlugin"/> OVERRIDES THIS METHOD AT A TIME.
+        /// SEE <see cref="InitBlockProducer"/> FOR MORE DETAILS ON THE INITIALIZATION PROCESS.
+        /// </remarks>
+        IBlockProducerRunner InitBlockProducerRunner(IBlockProducerRunnerFactory baseRunnerFactory,
+            IBlockProducer blockProducer) => baseRunnerFactory.InitBlockProducerRunner(blockProducer);
 
         /// <summary>
         /// Priorities for ordering multiple plugin. Only used to determine the wrapping order of block production.

src/Nethermind/Nethermind.Consensus.AuRa/AuRaPlugin.cs

@@ -68,12 +68,12 @@ public IBlockProducer InitBlockProducer(ITxSource? additionalTxSource = null)
             return null;
         }
 
-        public IBlockProducerRunner CreateBlockProducerRunner()
+        public IBlockProducerRunner InitBlockProducerRunner(IBlockProducer blockProducer)
         {
             return new StandardBlockProducerRunner(
                 _blockProducerStarter.CreateTrigger(),
                 _nethermindApi.BlockTree,
-                _nethermindApi.BlockProducer!);
+                blockProducer);
         }
 
         public INethermindApi CreateApi(IConfigProvider configProvider, IJsonSerializer jsonSerializer,

src/Nethermind/Nethermind.Consensus.Clique/CliquePlugin.cs

@@ -163,14 +163,14 @@ public IBlockProducer InitBlockProducer(ITxSource? additionalTxSource = null)
             return blockProducer;
         }
 
-        public IBlockProducerRunner CreateBlockProducerRunner()
+        public IBlockProducerRunner InitBlockProducerRunner(IBlockProducer blockProducer)
         {
             _blockProducerRunner = new CliqueBlockProducerRunner(
                 _nethermindApi.BlockTree,
                 _nethermindApi.Timestamper,
                 _nethermindApi.CryptoRandom,
                 _snapshotManager,
-                (CliqueBlockProducer)_nethermindApi.BlockProducer!,
+                (CliqueBlockProducer)blockProducer,
                 _cliqueConfig,
                 _nethermindApi.LogManager);
             _nethermindApi.DisposeStack.Push(_blockProducerRunner);

src/Nethermind/Nethermind.Consensus.Ethash/EthashPlugin.cs

@@ -52,12 +52,12 @@ public IBlockProducer InitBlockProducer(ITxSource? additionalTxSource = null)
 
         public string SealEngineType => Core.SealEngineType.Ethash;
 
-        public IBlockProducerRunner CreateBlockProducerRunner()
+        public IBlockProducerRunner InitBlockProducerRunner(IBlockProducer blockProducer)
         {
             return new StandardBlockProducerRunner(
                 _nethermindApi.ManualBlockProductionTrigger,
                 _nethermindApi.BlockTree,
-                _nethermindApi.BlockProducer!);
+                blockProducer);
         }
     }
 }

src/Nethermind/Nethermind.Consensus.Ethash/NethDevPlugin.cs

@@ -109,15 +109,15 @@ public IBlockProducer InitBlockProducer(ITxSource? additionalTxSource = null)
 
         public string SealEngineType => NethDev;
 
-        public IBlockProducerRunner CreateBlockProducerRunner()
+        public IBlockProducerRunner InitBlockProducerRunner(IBlockProducer blockProducer)
         {
             IBlockProductionTrigger trigger = new BuildBlocksRegularly(TimeSpan.FromMilliseconds(200))
                 .IfPoolIsNotEmpty(_nethermindApi.TxPool)
                 .Or(_nethermindApi.ManualBlockProductionTrigger);
             return new StandardBlockProducerRunner(
                 trigger,
                 _nethermindApi.BlockTree,
-                _nethermindApi.BlockProducer!);
+                blockProducer);
         }
     }
 }

src/Nethermind/Nethermind.Consensus/IBlockProducerRunnerFactory.cs

@@ -0,0 +1,15 @@
+// SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+namespace Nethermind.Consensus;
+
+public interface IBlockProducerRunnerFactory
+{
+    /// <summary>
+    /// Creates a <see cref="IBlockProducerRunner"/> to run the given <see cref="IBlockProducer"/>.
+    /// </summary>
+    /// <param name="blockProducer">
+    /// The instance of <see cref="IBlockProducer"/> that should be started by the runner.
+    /// </param>
+    IBlockProducerRunner InitBlockProducerRunner(IBlockProducer blockProducer);
+}

src/Nethermind/Nethermind.Evm.Test/Nethermind.Evm.Test.csproj

@@ -34,4 +34,10 @@
     <ProjectReference Include="..\Nethermind.JsonRpc\Nethermind.JsonRpc.csproj" />
     <ProjectReference Include="..\Nethermind.Synchronization\Nethermind.Synchronization.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="TestFiles\p256Verify.json">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>

src/Nethermind/Nethermind.Evm.Test/Secp256r1PrecompileTests.cs

@@ -0,0 +1,66 @@
+// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+using Nethermind.Core.Extensions;
+using Nethermind.Evm.Precompiles;
+using Nethermind.Specs.Forks;
+using NUnit.Framework;
+
+namespace Nethermind.Evm.Test
+{
+    [TestFixture]
+    public class Secp256r1PrecompileTests : VirtualMachineTestsBase
+    {
+        // ReSharper disable once ClassNeverInstantiated.Local
+        public record TestCase(string Input, string Expected, string Name);
+
+        private static IEnumerable<TestCase> TestSource()
+        {
+            // /~https://github.com/ethereum-optimism/op-geth/blob/7017b54770d480b5c8be63dc40eac9da166150f5/core/vm/testdata/precompiles/p256Verify.json
+            var data = File.ReadAllText("TestFiles/p256Verify.json");
+            return JsonSerializer.Deserialize<TestCase[]>(data);
+        }
+
+        [TestCaseSource(nameof(TestSource))]
+        public void Produces_Correct_Outputs(TestCase testCase)
+        {
+            var input = Bytes.FromHexString(testCase.Input);
+            var expected = Bytes.FromHexString(testCase.Expected);
+
+            (ReadOnlyMemory<byte> output, bool success) = Secp256r1Precompile.Instance.Run(input, Prague.Instance);
+
+            using (Assert.EnterMultipleScope())
+            {
+                Assert.That(success, Is.True);
+                Assert.That(output.ToArray(), Is.EquivalentTo(expected));
+            }
+        }
+
+        [Test]
+        [TestCase(
+            ""
+        )]
+        [TestCase(
+            "4cee90eb86eaa050036147a12d49004b6a"
+        )]
+        [TestCase(
+            "4cee90eb86eaa050036147a12d49004b6a958b991cfd78f16537fe6d1f4afd10273384db08bdfc843562a22b0626766686f6aec8247599f40bfe01bec0e0ecf17b4319559022d4d9bf007fe929943004eb4866760dedf319"
+        )]
+        public void Produces_Empty_Output_On_Invalid_Input(string input)
+        {
+            var bytes = Bytes.FromHexString(input);
+
+            (ReadOnlyMemory<byte> output, bool success) = Secp256r1Precompile.Instance.Run(bytes, Prague.Instance);
+
+            using (Assert.EnterMultipleScope())
+            {
+                Assert.That(success, Is.True);
+                Assert.That(output.ToArray(), Is.EquivalentTo(Array.Empty<byte>()));
+            }
+        }
+    }
+}