Feature/network di

src/Nethermind/Directory.Packages.props

@@ -6,6 +6,8 @@
     <PackageVersion Include="AspNetCore.HealthChecks.UI" Version="8.0.1" />
     <PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
     <PackageVersion Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
+    <PackageVersion Include="Autofac" Version="8.1.0" />
+    <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
     <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.12" />
     <PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0" />
@@ -36,6 +38,7 @@
     <PackageVersion Include="Microsoft.ClearScript.V8.Native.osx-x64" Version="7.4.5" />
     <PackageVersion Include="Microsoft.ClearScript.V8.Native.win-x64" Version="7.4.5" />
     <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />

src/Nethermind/Nethermind.Api/Extensions/ISynchronizationPlugin.cs

@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System.Threading.Tasks;
+using Autofac;
 
 namespace Nethermind.Api.Extensions
 {
     public interface ISynchronizationPlugin : INethermindPlugin
     {
-        Task InitSynchronization();
+        void ConfigureSynchronizationBuilder(ContainerBuilder containerBuilder);
+        Task InitSynchronization(IContainer container);
     }
 }

src/Nethermind/Nethermind.Api/IApiWithBlockchain.cs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 #nullable enable
+using Autofac;
 using Nethermind.Blockchain;
 using Nethermind.Blockchain.Filters;
 using Nethermind.Blockchain.FullPruning;
@@ -91,13 +92,23 @@ public interface IApiWithBlockchain : IApiWithStores, IBlockchainBridgeFactory
 
         IGasPriceOracle? GasPriceOracle { get; set; }
 
-        IEthSyncingInfo? EthSyncingInfo { get; set; }
+        IEthSyncingInfo? EthSyncingInfo { get; }
 
         CompositePruningTrigger PruningTrigger { get; }
 
         IBlockProductionPolicy? BlockProductionPolicy { get; set; }
         INodeStorageFactory NodeStorageFactory { get; set; }
-        BackgroundTaskScheduler BackgroundTaskScheduler { get; set; }
+        IBackgroundTaskScheduler BackgroundTaskScheduler { get; set; }
         CensorshipDetector CensorshipDetector { get; set; }
+
+        public ContainerBuilder ConfigureContainerBuilderFromApiWithBlockchain(ContainerBuilder builder)
+        {
+            ConfigureContainerBuilderFromApiWithStores(builder)
+                .AddPropertiesFrom<IApiWithBlockchain>(this)
+                .AddSingleton<INodeStorage>(NodeStorageFactory.WrapKeyValueStore(DbProvider!.StateDb));
+            if (TrieStore != null) builder.AddSingleton<IReadOnlyTrieStore>(TrieStore.AsReadOnly());
+
+            return builder;
+        }
     }
 }

src/Nethermind/Nethermind.Api/IApiWithNetwork.cs

@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System.Collections.Generic;
+using Autofac;
 using Nethermind.Consensus;
+using Nethermind.Core;
 using Nethermind.Core.PubSub;
 using Nethermind.Grpc;
 using Nethermind.JsonRpc;
@@ -16,37 +18,43 @@
 using Nethermind.Synchronization;
 using Nethermind.Synchronization.Peers;
 using Nethermind.Sockets;
+using Nethermind.Synchronization.ParallelSync;
 
 namespace Nethermind.Api
 {
     public interface IApiWithNetwork : IApiWithBlockchain
     {
         (IApiWithNetwork GetFromApi, IApiWithNetwork SetInApi) ForNetwork => (this, this);
 
-        IDisconnectsAnalyzer? DisconnectsAnalyzer { get; set; }
-        IDiscoveryApp? DiscoveryApp { get; set; }
+        IDiscoveryApp? DiscoveryApp { get; }
         IGrpcServer? GrpcServer { get; set; }
         IIPResolver? IpResolver { get; set; }
         IMessageSerializationService MessageSerializationService { get; }
         IGossipPolicy GossipPolicy { get; set; }
         IMonitoringService MonitoringService { get; set; }
-        INodeStatsManager? NodeStatsManager { get; set; }
-        IPeerManager? PeerManager { get; set; }
-        IPeerPool? PeerPool { get; set; }
-        IProtocolsManager? ProtocolsManager { get; set; }
-        IProtocolValidator? ProtocolValidator { get; set; }
+        INodeStatsManager? NodeStatsManager { get; }
+        IPeerManager? PeerManager { get; }
+        IPeerPool? PeerPool { get; }
         IList<IPublisher> Publishers { get; }
-        IRlpxHost? RlpxPeer { get; set; }
+        IRlpxHost? RlpxPeer { get; }
         IRpcModuleProvider? RpcModuleProvider { get; set; }
         IJsonRpcLocalStats? JsonRpcLocalStats { get; set; }
-        ISessionMonitor? SessionMonitor { get; set; }
-        IStaticNodesManager? StaticNodesManager { get; set; }
-        ISynchronizer? Synchronizer { get; set; }
-        IPivot? Pivot { get; set; }
-        ISyncPeerPool? SyncPeerPool { get; set; }
-        IPeerDifficultyRefreshPool? PeerDifficultyRefreshPool { get; set; }
-        ISyncServer? SyncServer { get; set; }
+        ISessionMonitor? SessionMonitor { get; }
+        IStaticNodesManager? StaticNodesManager { get; }
+        ISynchronizer? Synchronizer { get; }
+        ISyncModeSelector SyncModeSelector { get; }
+        ISyncPeerPool? SyncPeerPool { get; }
+        IPeerDifficultyRefreshPool? PeerDifficultyRefreshPool { get; }
+        ISyncServer? SyncServer { get; }
         IWebSocketsManager WebSocketsManager { get; set; }
         ISubscriptionFactory? SubscriptionFactory { get; set; }
+
+        IContainer? ApiWithNetworkServiceContainer { get; set; }
+
+        public ContainerBuilder ConfigureContainerBuilderFromApiWithNetwork(ContainerBuilder builder)
+        {
+            return ConfigureContainerBuilderFromApiWithBlockchain(builder)
+                .AddPropertiesFrom(this);
+        }
     }
 }

src/Nethermind/Nethermind.Api/IApiWithStores.cs

@@ -1,11 +1,13 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
+using Autofac;
 using Nethermind.Blockchain;
 using Nethermind.Blockchain.Blocks;
 using Nethermind.Blockchain.Find;
 using Nethermind.Blockchain.Receipts;
 using Nethermind.Consensus;
+using Nethermind.Core;
 using Nethermind.Crypto;
 using Nethermind.Db.Blooms;
 using Nethermind.State.Repositories;
@@ -29,5 +31,11 @@ public interface IApiWithStores : IBasicApi
         IReceiptMonitor? ReceiptMonitor { get; set; }
         IWallet? Wallet { get; set; }
         IBlockStore? BadBlocksStore { get; set; }
+
+        public ContainerBuilder ConfigureContainerBuilderFromApiWithStores(ContainerBuilder builder)
+        {
+            return ConfigureContainerBuilderFromBasicApi(builder)
+                .AddPropertiesFrom<IApiWithStores>(this);
+        }
     }
 }

src/Nethermind/Nethermind.Api/IBasicApi.cs

@@ -1,11 +1,14 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
+using System;
 using System.Collections.Generic;
 using System.IO.Abstractions;
 using System.Linq;
+using Autofac;
 using Nethermind.Abi;
 using Nethermind.Api.Extensions;
+using Nethermind.Blockchain.Synchronization;
 using Nethermind.Config;
 using Nethermind.Core;
 using Nethermind.Core.Specs;
@@ -14,10 +17,10 @@
 using Nethermind.Db;
 using Nethermind.KeyStore;
 using Nethermind.Logging;
+using Nethermind.Network.Config;
 using Nethermind.Serialization.Json;
 using Nethermind.Specs.ChainSpecStyle;
 using Nethermind.Synchronization;
-using Nethermind.Synchronization.ParallelSync;
 
 namespace Nethermind.Api
 {
@@ -38,11 +41,10 @@ public interface IBasicApi
         ILogManager LogManager { get; set; }
         ProtectedPrivateKey? OriginalSignerKey { get; set; }
         IReadOnlyList<INethermindPlugin> Plugins { get; }
+        [SkipServiceCollection]
         string SealEngineType { get; set; }
         ISpecProvider? SpecProvider { get; set; }
-        ISyncModeSelector SyncModeSelector { get; set; }
-        ISyncProgressResolver? SyncProgressResolver { get; set; }
-        IBetterPeerStrategy? BetterPeerStrategy { get; set; }
+        IBetterPeerStrategy? BetterPeerStrategy { get; }
         ITimestamper Timestamper { get; }
         ITimerFactory TimerFactory { get; }
         IProcessExitSource? ProcessExit { get; set; }
@@ -57,5 +59,16 @@ public IEnumerable<IConsensusWrapperPlugin> GetConsensusWrapperPlugins() =>
 
         public IEnumerable<ISynchronizationPlugin> GetSynchronizationPlugins() =>
             Plugins.OfType<ISynchronizationPlugin>();
+
+        public ContainerBuilder ConfigureContainerBuilderFromBasicApi(ContainerBuilder builder)
+        {
+            builder.AddPropertiesFrom<IBasicApi>(this);
+            builder.Register<IEthereumEcdsa, IEcdsa>(ecdsa => ecdsa);
+            builder.RegisterSource(new ConfigRegistrationSource());
+
+            DbProvider!.ConfigureServiceCollection(builder);
+
+            return builder;
+        }
     }
 }

src/Nethermind/Nethermind.Api/NethermindApi.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.IO.Abstractions;
+using Autofac;
 using Nethermind.Abi;
 using Nethermind.Api.Extensions;
 using Nethermind.Blockchain;
@@ -126,8 +127,8 @@ public IBlockchainBridge CreateBlockchainBridge()
         public ICryptoRandom CryptoRandom { get; }
         public IDbProvider? DbProvider { get; set; }
         public IDbFactory? DbFactory { get; set; }
-        public IDisconnectsAnalyzer? DisconnectsAnalyzer { get; set; }
-        public IDiscoveryApp? DiscoveryApp { get; set; }
+
+        public IDiscoveryApp? DiscoveryApp => ApiWithNetworkServiceContainer?.ResolveOptional<IDiscoveryApp>();
         public ISigner? EngineSigner { get; set; }
         public ISignerStore? EngineSignerStore { get; set; }
         public IEnode? Enode { get; set; }
@@ -152,16 +153,14 @@ public IBlockchainBridge CreateBlockchainBridge()
         public IMessageSerializationService MessageSerializationService { get; } = new MessageSerializationService();
         public IGossipPolicy GossipPolicy { get; set; } = Policy.FullGossip;
         public IMonitoringService MonitoringService { get; set; } = NullMonitoringService.Instance;
-        public INodeStatsManager? NodeStatsManager { get; set; }
-        public IPeerManager? PeerManager { get; set; }
-        public IPeerPool? PeerPool { get; set; }
-        public IProtocolsManager? ProtocolsManager { get; set; }
-        public IProtocolValidator? ProtocolValidator { get; set; }
+        public INodeStatsManager? NodeStatsManager => ApiWithNetworkServiceContainer?.ResolveOptional<INodeStatsManager>();
+        public IPeerManager? PeerManager => ApiWithNetworkServiceContainer?.ResolveOptional<IPeerManager>();
+        public IPeerPool? PeerPool => ApiWithNetworkServiceContainer?.ResolveOptional<IPeerPool>();
         public IReceiptStorage? ReceiptStorage { get; set; }
         public IReceiptFinder? ReceiptFinder { get; set; }
         public IReceiptMonitor? ReceiptMonitor { get; set; }
         public IRewardCalculatorSource? RewardCalculatorSource { get; set; } = NoBlockRewards.Instance;
-        public IRlpxHost? RlpxPeer { get; set; }
+        public IRlpxHost? RlpxPeer => ApiWithNetworkServiceContainer?.ResolveOptional<IRlpxHost>();
         public IRpcModuleProvider? RpcModuleProvider { get; set; } = NullModuleProvider.Instance;
         public IRpcAuthentication? RpcAuthentication { get; set; }
         public IJsonRpcLocalStats? JsonRpcLocalStats { get; set; }
@@ -182,23 +181,22 @@ public ISealEngine SealEngine
             }
         }
 
-        public ISessionMonitor? SessionMonitor { get; set; }
+        public ISessionMonitor? SessionMonitor => ApiWithNetworkServiceContainer?.ResolveOptional<ISessionMonitor>();
         public ISpecProvider? SpecProvider { get; set; }
         public IPoSSwitcher PoSSwitcher { get; set; } = NoPoS.Instance;
-        public ISyncModeSelector SyncModeSelector { get; set; } = null!;
-
-        public ISyncProgressResolver? SyncProgressResolver { get; set; }
-        public IBetterPeerStrategy? BetterPeerStrategy { get; set; }
-        public IPivot? Pivot { get; set; }
-        public ISyncPeerPool? SyncPeerPool { get; set; }
-        public IPeerDifficultyRefreshPool? PeerDifficultyRefreshPool { get; set; }
-        public ISynchronizer? Synchronizer { get; set; }
-        public ISyncServer? SyncServer { get; set; }
+        public ISyncModeSelector SyncModeSelector => ApiWithNetworkServiceContainer?.ResolveOptional<ISyncModeSelector>()!;
+        public IBetterPeerStrategy? BetterPeerStrategy => ApiWithNetworkServiceContainer?.ResolveOptional<IBetterPeerStrategy>();
+        public ISyncPeerPool? SyncPeerPool => ApiWithNetworkServiceContainer?.ResolveOptional<ISyncPeerPool>();
+        public IPeerDifficultyRefreshPool? PeerDifficultyRefreshPool => ApiWithNetworkServiceContainer?.ResolveOptional<IPeerDifficultyRefreshPool>();
+        public ISynchronizer? Synchronizer => ApiWithNetworkServiceContainer?.ResolveOptional<ISynchronizer>();
+        public ISyncServer? SyncServer => ApiWithNetworkServiceContainer?.ResolveOptional<ISyncServer>();
+
+        [SkipServiceCollection]
         public IWorldState? WorldState { get; set; }
         public IReadOnlyStateProvider? ChainHeadStateProvider { get; set; }
         public IWorldStateManager? WorldStateManager { get; set; }
         public IStateReader? StateReader { get; set; }
-        public IStaticNodesManager? StaticNodesManager { get; set; }
+        public IStaticNodesManager? StaticNodesManager => ApiWithNetworkServiceContainer?.ResolveOptional<IStaticNodesManager>();
         public ITimestamper Timestamper { get; } = Core.Timestamper.Default;
         public ITimerFactory TimerFactory { get; } = Core.Timers.TimerFactory.Default;
         public ITransactionProcessor? TransactionProcessor { get; set; }
@@ -216,10 +214,10 @@ public ISealEngine SealEngine
         public IBlockProducerEnvFactory? BlockProducerEnvFactory { get; set; }
         public IGasPriceOracle? GasPriceOracle { get; set; }
 
-        public IEthSyncingInfo? EthSyncingInfo { get; set; }
+        public IEthSyncingInfo? EthSyncingInfo => ApiWithNetworkServiceContainer?.ResolveOptional<IEthSyncingInfo>();
         public IBlockProductionPolicy? BlockProductionPolicy { get; set; }
         public INodeStorageFactory NodeStorageFactory { get; set; } = null!;
-        public BackgroundTaskScheduler BackgroundTaskScheduler { get; set; } = null!;
+        public IBackgroundTaskScheduler BackgroundTaskScheduler { get; set; } = null!;
         public CensorshipDetector CensorshipDetector { get; set; } = null!;
         public IWallet? Wallet { get; set; }
         public IBlockStore? BadBlocksStore { get; set; }
@@ -241,5 +239,7 @@ public ISealEngine SealEngine
         public CompositePruningTrigger PruningTrigger { get; } = new();
         public IProcessExitSource? ProcessExit { get; set; }
         public CompositeTxGossipPolicy TxGossipPolicy { get; } = new();
+
+        public IContainer? ApiWithNetworkServiceContainer { get; set; }
     }
 }

src/Nethermind/Nethermind.Blockchain/Synchronization/ISyncConfig.cs

@@ -143,4 +143,7 @@ public interface ISyncConfig : IConfig
 
     [ConfigItem(Description = "_Technical._ MultiSyncModeSelector sync mode timer loop interval. Used for testing.", DefaultValue = "1000", HiddenFromDocs = true)]
     int MultiSyncModeSelectorLoopTimerMs { get; set; }
+
+    [ConfigItem(Description = "_Technical._ MultiSyncModeSelector will wait for header to completely sync first.", DefaultValue = "false", HiddenFromDocs = true)]
+    bool NeedToWaitForHeader { get; set; }
 }

src/Nethermind/Nethermind.Blockchain/Synchronization/SyncConfig.cs

@@ -65,6 +65,7 @@ public string? PivotHash
         public int MallocTrimIntervalSec { get; set; } = 300;
         public bool? SnapServingEnabled { get; set; } = null;
         public int MultiSyncModeSelectorLoopTimerMs { get; set; } = 1000;
+        public bool NeedToWaitForHeader { get; set; }
         public bool TrieHealing { get; set; } = true;
 
         public override string ToString()

src/Nethermind/Nethermind.Config/ConfigRegistrationSource.cs

@@ -0,0 +1,51 @@
+// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Autofac;
+using Autofac.Core;
+using Autofac.Core.Activators.Delegate;
+using Autofac.Core.Lifetime;
+using Autofac.Core.Registration;
+
+namespace Nethermind.Config;
+
+/// <summary>
+/// Dynamically resolve IConfig<T>
+/// </summary>
+public class ConfigRegistrationSource : IRegistrationSource
+{
+    public IEnumerable<IComponentRegistration> RegistrationsFor(Service service, Func<Service, IEnumerable<ServiceRegistration>> registrationAccessor)
+    {
+        IServiceWithType swt = service as IServiceWithType;
+        if (swt == null || !typeof(IConfig).IsAssignableFrom(swt.ServiceType))
+        {
+            // It's not a request for the base handler type, so skip it.
+            return Enumerable.Empty<IComponentRegistration>();
+        }
+
+        // Dynamically resolve IConfig
+        ComponentRegistration registration = new ComponentRegistration(
+            Guid.NewGuid(),
+            new DelegateActivator(swt.ServiceType, (c, p) =>
+            {
+                IConfigProvider configProvider = c.Resolve<IConfigProvider>();
+                object config = typeof(IConfigProvider)
+                    .GetMethod("GetConfig")
+                    .MakeGenericMethod(swt.ServiceType)
+                    .Invoke(configProvider, new object[] { });
+                return config;
+            }),
+            new RootScopeLifetime(),
+            InstanceSharing.Shared,
+            InstanceOwnership.OwnedByLifetimeScope,
+            new[] { service },
+            new Dictionary<string, object>());
+
+        return new IComponentRegistration[] { registration };
+    }
+
+    public bool IsAdapterForIndividualComponents => false;
+}