Fix worker loop

Directory.Packages.props

@@ -48,7 +48,6 @@
     <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
     <PackageVersion Include="Nethermind.Crypto.Bls" Version="1.0.5" />
-    <PackageVersion Include="Nethermind.Crypto.Pairings" Version="1.1.1" />
     <PackageVersion Include="Nethermind.Crypto.SecP256k1" Version="1.4.1" />
     <PackageVersion Include="Nethermind.Crypto.SecP256r1" Version="1.0.0-preview.6" />
     <PackageVersion Include="Nethermind.DotNetty.Buffers" Version="1.0.1" />
@@ -57,6 +56,7 @@
     <PackageVersion Include="Nethermind.GmpBindings" Version="1.0.2" />
     <PackageVersion Include="Nethermind.Libp2p" Version="1.0.0-preview.45" />
     <PackageVersion Include="Nethermind.Libp2p.Protocols.PubsubPeerDiscovery" Version="1.0.0-preview.45" />
+    <PackageVersion Include="Nethermind.MclBindings" Version="1.0.0" />
     <PackageVersion Include="Nethermind.Numerics.Int256" Version="1.3.6" />
     <PackageVersion Include="Nito.Collections.Deque" Version="1.2.1" />
     <PackageVersion Include="NJsonSchema" Version="11.3.2" />

README.md

@@ -47,7 +47,7 @@ The standalone release builds are available on [GitHub Releases](https://github.
   On Windows, Nethermind can be installed via Windows Package Manager:
 
   ```powershell
-  winget install nethermind
+  winget install --id Nethermind.Nethermind
   ```
 
 - **macOS**

nuget.config

@@ -3,14 +3,14 @@
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <!-- <add key="nugettest.org" value="https://apiint.nugettest.org/v3/index.json" /> -->
+    <!--<add key="nugettest.org" value="https://apiint.nugettest.org/v3/index.json" />-->
   </packageSources>
   <packageSourceMapping>
     <packageSource key="nuget.org">
       <package pattern="*" />
     </packageSource>
-    <!-- <packageSource key="nugettest.org">
+    <!--<packageSource key="nugettest.org">
       <package pattern="" />
-    </packageSource> -->
+    </packageSource>-->
   </packageSourceMapping>
 </configuration>

src/Nethermind/Benchmarks.slnx

@@ -14,6 +14,7 @@
     <Project Path="Nethermind.EthStats/Nethermind.EthStats.csproj" />
     <Project Path="Nethermind.Evm.Test/Nethermind.Evm.Test.csproj" />
     <Project Path="Nethermind.Evm/Nethermind.Evm.csproj" />
+    <Project Path="Nethermind.Evm.Precompiles/Nethermind.Evm.Precompiles.csproj" />
     <Project Path="Nethermind.Facade/Nethermind.Facade.csproj" />
     <Project Path="Nethermind.Grpc/Nethermind.Grpc.csproj" />
     <Project Path="Nethermind.Init\Nethermind.Init.csproj" />

src/Nethermind/Nethermind.Api/BasicApiExtensions.cs

@@ -12,10 +12,5 @@ public static T Config<T>(this IBasicApi api) where T : IConfig
         {
             return api.ConfigProvider.GetConfig<T>();
         }
-
-        public static T Db<T>(this IBasicApi api, string dbName) where T : class, IDb
-        {
-            return api.DbProvider!.GetDb<T>(dbName);
-        }
     }
 }

src/Nethermind/Nethermind.Api/IApiWithStores.cs

@@ -17,7 +17,7 @@ namespace Nethermind.Api
 {
     public interface IApiWithStores : IBasicApi
     {
-        IBlobTxStorage? BlobTxStorage { get; set; }
+        IBlobTxStorage BlobTxStorage { get; }
         IBlockTree? BlockTree { get; set; }
         IBloomStorage? BloomStorage { get; set; }
         IChainLevelInfoRepository? ChainLevelInfoRepository { get; set; }

src/Nethermind/Nethermind.Api/IBasicApi.cs

@@ -31,8 +31,7 @@ public interface IBasicApi
         [SkipServiceCollection]
         IConfigProvider ConfigProvider { get; }
         ICryptoRandom CryptoRandom { get; }
-        IDbProvider? DbProvider { get; set; }
-        IDbFactory? DbFactory { get; set; }
+        IDbProvider DbProvider { get; }
         IEthereumEcdsa EthereumEcdsa { get; }
         [SkipServiceCollection]
         IJsonSerializer EthereumJsonSerializer { get; }

src/Nethermind/Nethermind.Api/NethermindApi.cs

@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.IO.Abstractions;
 using Autofac;
-using Nethermind.Abi;
 using Nethermind.Api.Extensions;
 using Nethermind.Blockchain;
 using Nethermind.Blockchain.Blocks;
@@ -71,7 +70,7 @@ public IBlockchainBridge CreateBlockchainBridge()
             return Context.Resolve<IBlockchainBridgeFactory>().CreateBlockchainBridge();
         }
 
-        public IBlobTxStorage? BlobTxStorage { get; set; }
+        public IBlobTxStorage BlobTxStorage => Context.Resolve<IBlobTxStorage>();
         public CompositeBlockPreprocessorStep BlockPreprocessor { get; } = new();
         public IBlockProcessingQueue? BlockProcessingQueue { get; set; }
         public IBlockProducer? BlockProducer { get; set; }
@@ -82,8 +81,7 @@ public IBlockchainBridge CreateBlockchainBridge()
         public IChainLevelInfoRepository? ChainLevelInfoRepository { get; set; }
         public IConfigProvider ConfigProvider => _dependencies.ConfigProvider;
         public ICryptoRandom CryptoRandom => Context.Resolve<ICryptoRandom>();
-        public IDbProvider? DbProvider { get; set; }
-        public IDbFactory? DbFactory { get; set; }
+        public IDbProvider DbProvider => Context.Resolve<IDbProvider>();
         public ISigner? EngineSigner { get; set; }
         public ISignerStore? EngineSignerStore { get; set; }
         public IEnode? Enode { get; set; }

src/Nethermind/Nethermind.AuRa.Test/AuRaPluginTests.cs

@@ -43,7 +43,6 @@ public void Init_when_not_AuRa_doesnt_trow()
                 Substitute.For<IProcessExitSource>(),
                 testNethermindContainer);
             AuRaNethermindApi api = new AuRaNethermindApi(apiDependencies);
-            api.DbProvider = TestMemDbProvider.Init();
             Action init = () => auRaPlugin.Init(api);
             init.Should().NotThrow();
         }

src/Nethermind/Nethermind.Blockchain.Test/BlockchainProcessorTests.cs

@@ -524,7 +524,7 @@ public async Task Can_process_fast_sync()
                     new FixedForkActivationChainHeadSpecProvider(specProvider, fixedBlock: 10_000_000),
                     blockTree,
                     readOnlyState,
-                    new CodeInfoRepository())
+                    new EthereumCodeInfoRepository())
                 {
                     HasSynced = true
                 };

src/Nethermind/Nethermind.Blockchain.Test/FullPruning/FullPruningDiskTest.cs

@@ -10,6 +10,7 @@
 using System.Threading.Tasks;
 using Autofac;
 using FluentAssertions;
+using Nethermind.Api;
 using Nethermind.Blockchain.FullPruning;
 using Nethermind.Config;
 using Nethermind.Core;
@@ -75,16 +76,14 @@ protected override async Task<TestBlockchain> Build(Action<ContainerBuilder>? co
             return chain;
         }
 
-        protected override ContainerBuilder ConfigureContainer(ContainerBuilder builder, IConfigProvider configProvider)
-        {
-            IDbProvider dbProvider = new DbProvider();
-            RocksDbFactory rocksDbFactory = new(new DbConfig(), LimboLogs.Instance, TempDirectory.Path);
-            StandardDbInitializer standardDbInitializer = new(dbProvider, rocksDbFactory, new FileSystem());
-            standardDbInitializer.InitStandardDbs(true);
-
-            return base.ConfigureContainer(builder, configProvider)
-                .AddSingleton<IDbProvider>(dbProvider);
-        }
+        protected override ContainerBuilder ConfigureContainer(ContainerBuilder builder, IConfigProvider configProvider) =>
+            // Reenable rocksdb
+            base.ConfigureContainer(builder, configProvider)
+                .AddSingleton<IDbFactory, RocksDbFactory>()
+                .Intercept<IInitConfig>((initConfig) =>
+                {
+                    initConfig.BaseDbPath = TempDirectory.Path;
+                });
 
         public override void Dispose()
         {

src/Nethermind/Nethermind.Blockchain.Test/Producers/DevBlockproducerTests.cs

@@ -2,31 +2,16 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System.Threading;
+using Autofac;
 using FluentAssertions;
-using Nethermind.Blockchain.BeaconBlockRoot;
-using Nethermind.Blockchain.Blocks;
-using Nethermind.Blockchain.Receipts;
-using Nethermind.Config;
+using Nethermind.Api;
 using Nethermind.Consensus;
-using Nethermind.Consensus.ExecutionRequests;
-using Nethermind.Consensus.Processing;
 using Nethermind.Consensus.Producers;
-using Nethermind.Consensus.Rewards;
 using Nethermind.Consensus.Transactions;
 using Nethermind.Consensus.Validators;
-using Nethermind.Consensus.Withdrawals;
 using Nethermind.Core;
-using Nethermind.Core.Specs;
-using Nethermind.Core.Test;
 using Nethermind.Core.Test.Builders;
-using Nethermind.Db;
-using Nethermind.Evm;
-using Nethermind.Evm.Config;
-using Nethermind.Evm.TransactionProcessing;
-using Nethermind.Logging;
-using Nethermind.Specs;
-using Nethermind.Evm.State;
-using Nethermind.State;
+using Nethermind.Core.Test.Modules;
 using NUnit.Framework;
 
 namespace Nethermind.Blockchain.Test.Producers;
@@ -36,70 +21,18 @@ public class DevBlockProducerTests
     [Test, MaxTime(Timeout.MaxTestTime)]
     public void Test()
     {
-        ISpecProvider specProvider = MainnetSpecProvider.Instance;
-        DbProvider dbProvider = new();
-        dbProvider.RegisterDb(DbNames.BlockInfos, new MemDb());
-        dbProvider.RegisterDb(DbNames.Blocks, new MemDb());
-        dbProvider.RegisterDb(DbNames.Headers, new MemDb());
-        dbProvider.RegisterDb(DbNames.State, new MemDb());
-        dbProvider.RegisterDb(DbNames.Code, new MemDb());
-        dbProvider.RegisterDb(DbNames.Metadata, new MemDb());
+        using IContainer container = new ContainerBuilder()
+            .AddModule(new TestNethermindModule())
+            .AddSingleton<IBlockValidator>(Always.Valid)
+            .AddSingleton<IBlockProducerTxSourceFactory, EmptyTxSourceFactory>()
+            .AddScoped<IBlockProducerFactory, TestBlockProcessingModule.AutoBlockProducerFactory<DevBlockProducer>>()
+            .Build();
 
-        BlockTree blockTree = Build.A.BlockTree()
-            .WithoutSettingHead
-            .TestObject;
+        IBlockTree blockTree = container.Resolve<IBlockTree>();
+        IManualBlockProductionTrigger trigger = container.Resolve<IManualBlockProductionTrigger>();
 
-        IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest(dbProvider, LimboLogs.Instance);
-        IWorldState stateProvider = worldStateManager.GlobalWorldState;
-        IStateReader stateReader = worldStateManager.GlobalStateReader;
-        BlockhashProvider blockhashProvider = new(blockTree, specProvider, stateProvider, LimboLogs.Instance);
-        CodeInfoRepository codeInfoRepository = new();
-        VirtualMachine virtualMachine = new(
-            blockhashProvider,
-            specProvider,
-            LimboLogs.Instance);
-        TransactionProcessor txProcessor = new(
-            specProvider,
-            stateProvider,
-            virtualMachine,
-            codeInfoRepository,
-            LimboLogs.Instance);
-        BlockProcessor blockProcessor = new BlockProcessor(
-            specProvider,
-            Always.Valid,
-            NoBlockRewards.Instance,
-            new BlockProcessor.BlockValidationTransactionsExecutor(new ExecuteTransactionProcessorAdapter(txProcessor), stateProvider),
-            stateProvider,
-            NullReceiptStorage.Instance,
-            new BeaconBlockRootHandler(txProcessor, stateProvider),
-            new BlockhashStore(specProvider, stateProvider),
-            LimboLogs.Instance,
-            new WithdrawalProcessor(stateProvider, LimboLogs.Instance),
-            new ExecutionRequestsProcessor(txProcessor));
-        BlockchainProcessor blockchainProcessor = new(
-            blockTree,
-            blockProcessor,
-            NullRecoveryStep.Instance,
-            stateReader,
-            LimboLogs.Instance,
-            BlockchainProcessor.Options.Default);
-        BuildBlocksWhenRequested trigger = new();
-        ManualTimestamper timestamper = new ManualTimestamper();
-        DevBlockProducer devBlockProducer = new(
-            EmptyTxSource.Instance,
-            blockchainProcessor,
-            stateProvider,
-            blockTree,
-            timestamper,
-            specProvider,
-            new BlocksConfig(),
-            LimboLogs.Instance);
-
-        StandardBlockProducerRunner blockProducerRunner = new StandardBlockProducerRunner(trigger, blockTree, devBlockProducer);
-
-        blockchainProcessor.Start();
-        blockProducerRunner.Start();
-        ProducedBlockSuggester _ = new ProducedBlockSuggester(blockTree, blockProducerRunner);
+        container.Resolve<IMainProcessingContext>().BlockchainProcessor.Start();
+        container.Resolve<IBlockProducerRunner>().Start();
 
         AutoResetEvent autoResetEvent = new(false);
 
@@ -112,4 +45,12 @@ public void Test()
         autoResetEvent.WaitOne(1000).Should().BeTrue("1");
         blockTree.Head!.Number.Should().Be(1);
     }
+
+    private class EmptyTxSourceFactory : IBlockProducerTxSourceFactory
+    {
+        public ITxSource Create()
+        {
+            return EmptyTxSource.Instance;
+        }
+    }
 }

src/Nethermind/Nethermind.Blockchain.Test/ReorgTests.cs

@@ -17,6 +17,7 @@
 using Nethermind.Core.Specs;
 using Nethermind.Core.Test;
 using Nethermind.Core.Test.Builders;
+using Nethermind.Core.Test.Db;
 using Nethermind.Crypto;
 using Nethermind.Db;
 using Nethermind.Evm;
@@ -73,7 +74,7 @@ public void Setup()
             .WithSpecProvider(specProvider)
             .TestObject;
 
-        CodeInfoRepository codeInfoRepository = new();
+        EthereumCodeInfoRepository codeInfoRepository = new();
         TxPool.TxPool txPool = new(
             ecdsa,
             new BlobTxStorage(),

src/Nethermind/Nethermind.Blockchain.Test/TransactionProcessorEip7702Tests.cs

@@ -19,6 +19,7 @@
 using Nethermind.Core.Crypto;
 using System;
 using System.Linq;
+using Nethermind.Blockchain;
 using Nethermind.Blockchain.Tracing;
 using Nethermind.Core.Test;
 using Nethermind.Int256;
@@ -40,7 +41,7 @@ public void Setup()
         _specProvider = new TestSpecProvider(Prague.Instance);
         IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest();
         _stateProvider = worldStateManager.GlobalWorldState;
-        CodeInfoRepository codeInfoRepository = new();
+        EthereumCodeInfoRepository codeInfoRepository = new();
         VirtualMachine virtualMachine = new(new TestBlockhashProvider(_specProvider), _specProvider, LimboLogs.Instance);
         _transactionProcessor = new TransactionProcessor(_specProvider, _stateProvider, virtualMachine, codeInfoRepository, LimboLogs.Instance);
         _ethereumEcdsa = new EthereumEcdsa(_specProvider.ChainId);

src/Nethermind/Nethermind.Blockchain.Test/TransactionProcessorTests.cs

@@ -25,6 +25,7 @@
 using NUnit.Framework;
 using Nethermind.Config;
 using System.Collections.Generic;
+using Nethermind.Blockchain;
 using Nethermind.Blockchain.Tracing;
 using Nethermind.Core.Test;
 using Nethermind.State;
@@ -60,7 +61,7 @@ public void Setup()
         _stateProvider.Commit(_specProvider.GenesisSpec);
         _stateProvider.CommitTree(0);
 
-        CodeInfoRepository codeInfoRepository = new();
+        EthereumCodeInfoRepository codeInfoRepository = new();
         VirtualMachine virtualMachine = new(new TestBlockhashProvider(_specProvider), _specProvider, LimboLogs.Instance);
         _transactionProcessor = new TransactionProcessor(_specProvider, _stateProvider, virtualMachine, codeInfoRepository, LimboLogs.Instance);
         _ethereumEcdsa = new EthereumEcdsa(_specProvider.ChainId);

src/Nethermind/Nethermind.Blockchain/CachedCodeInfoRepository.cs

@@ -0,0 +1,56 @@
+// SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using Nethermind.Core;
+using Nethermind.Core.Specs;
+using Nethermind.Evm;
+using Nethermind.Evm.CodeAnalysis;
+using Nethermind.Evm.Precompiles;
+using Nethermind.State;
+
+namespace Nethermind.Blockchain;
+
+public class CachedCodeInfoRepository(
+    FrozenDictionary<AddressAsKey, PrecompileInfo> precompiles,
+    ConcurrentDictionary<PreBlockCaches.PrecompileCacheKey, (byte[], bool)>? precompileCache) : CodeInfoRepository(
+    precompileCache is null
+        ? precompiles
+        : precompiles.ToFrozenDictionary(kvp => kvp.Key, kvp => CreateCachedPrecompile(kvp, precompileCache)))
+{
+    private static PrecompileInfo CreateCachedPrecompile(
+        in KeyValuePair<AddressAsKey, PrecompileInfo> originalPrecompile,
+        ConcurrentDictionary<PreBlockCaches.PrecompileCacheKey, (byte[], bool)> cache) =>
+        new PrecompileInfo(new CachedPrecompile(originalPrecompile.Key.Value, originalPrecompile.Value.Precompile!, cache));
+
+    private class CachedPrecompile(
+        Address address,
+        IPrecompile precompile,
+        ConcurrentDictionary<PreBlockCaches.PrecompileCacheKey, (byte[], bool)> cache) : IPrecompile
+    {
+        public static Address Address => Address.Zero;
+
+        public static string Name => "";
+
+        public long BaseGasCost(IReleaseSpec releaseSpec) => precompile.BaseGasCost(releaseSpec);
+
+        public long DataGasCost(ReadOnlyMemory<byte> inputData, IReleaseSpec releaseSpec) => precompile.DataGasCost(inputData, releaseSpec);
+
+        public (byte[], bool) Run(ReadOnlyMemory<byte> inputData, IReleaseSpec releaseSpec)
+        {
+            PreBlockCaches.PrecompileCacheKey key = new(address, inputData);
+            if (!cache.TryGetValue(key, out (byte[], bool) result))
+            {
+                result = precompile.Run(inputData, releaseSpec);
+                // we need to rebuild the key with data copy as the data can be changed by VM processing
+                key = new PreBlockCaches.PrecompileCacheKey(address, inputData.ToArray());
+                cache.TryAdd(key, result);
+            }
+
+            return result;
+        }
+    }
+}