Feature/Single Pluggable DI Container

src/Nethermind/Nethermind.Analytics/AnalyticsPlugin.cs

@@ -12,14 +12,11 @@
 
 namespace Nethermind.Analytics
 {
-    public class AnalyticsPlugin : INethermindPlugin
+    public class AnalyticsPlugin(IAnalyticsConfig analyticsConfig, IInitConfig initConfig) : INethermindPlugin
     {
-        private IAnalyticsConfig _analyticsConfig;
         private IList<IPublisher> _publishers;
         private INethermindApi _api;
 
-        private bool _isOn;
-
         public ValueTask DisposeAsync() { return ValueTask.CompletedTask; }
 
         public string Name => "Analytics";
@@ -28,19 +25,20 @@ public class AnalyticsPlugin : INethermindPlugin
 
         public string Author => "Nethermind";
 
+
+        public bool Enabled => initConfig.WebSocketsEnabled &&
+                                    (analyticsConfig.PluginsEnabled ||
+                                     analyticsConfig.StreamBlocks ||
+                                     analyticsConfig.StreamTransactions);
+
         public Task Init(INethermindApi api)
         {
             _api = api;
             var (getFromAPi, _) = _api.ForInit;
-            _analyticsConfig = getFromAPi.Config<IAnalyticsConfig>();
 
             IInitConfig initConfig = getFromAPi.Config<IInitConfig>();
-            _isOn = initConfig.WebSocketsEnabled &&
-                    (_analyticsConfig.PluginsEnabled ||
-                     _analyticsConfig.StreamBlocks ||
-                     _analyticsConfig.StreamTransactions);
 
-            if (!_isOn)
+            if (!Enabled)
             {
                 if (!initConfig.WebSocketsEnabled)
                 {
@@ -57,7 +55,7 @@ public Task Init(INethermindApi api)
 
         private void TxPoolOnNewDiscovered(object sender, TxEventArgs e)
         {
-            if (_analyticsConfig.StreamTransactions)
+            if (analyticsConfig.StreamTransactions)
             {
                 foreach (IPublisher publisher in _publishers)
                 {
@@ -70,12 +68,12 @@ private void TxPoolOnNewDiscovered(object sender, TxEventArgs e)
         public Task InitNetworkProtocol()
         {
             var (getFromAPi, _) = _api.ForNetwork;
-            if (_isOn)
+            if (Enabled)
             {
                 getFromAPi.TxPool!.NewDiscovered += TxPoolOnNewDiscovered;
             }
 
-            if (_isOn)
+            if (Enabled)
             {
                 AnalyticsWebSocketsModule webSocketsModule = new(getFromAPi.EthereumJsonSerializer, getFromAPi.LogManager);
                 getFromAPi.WebSocketsManager!.AddModule(webSocketsModule, true);

src/Nethermind/Nethermind.Api.Test/TestPlugin.cs

@@ -30,5 +30,7 @@ public Task InitRpcModules()
         {
             throw new System.NotImplementedException();
         }
+
+        public bool Enabled => true;
     }
 }

src/Nethermind/Nethermind.Api.Test/TestPlugin2.cs

@@ -30,5 +30,7 @@ public Task InitRpcModules()
         {
             throw new System.NotImplementedException();
         }
+
+        public bool Enabled => true;
     }
 }

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

@@ -1,23 +1,14 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using System.Threading.Tasks;
-using Nethermind.Config;
 using Nethermind.Consensus;
-using Nethermind.Consensus.Producers;
-using Nethermind.Logging;
-using Nethermind.Serialization.Json;
-using Nethermind.Specs.ChainSpecStyle;
 
 namespace Nethermind.Api.Extensions
 {
     public interface IConsensusPlugin : INethermindPlugin, IBlockProducerFactory
     {
         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

@@ -17,6 +17,6 @@ public interface IConsensusWrapperPlugin : INethermindPlugin
         /// </summary>
         int Priority => 0;
 
-        bool Enabled { get; }
+        bool ConsensusWrapperEnabled { get; }
     }
 }

src/Nethermind/Nethermind.Api/Extensions/INethermindPlugin.cs

@@ -3,6 +3,8 @@
 
 using System;
 using System.Threading.Tasks;
+using Autofac;
+using Autofac.Core;
 
 namespace Nethermind.Api.Extensions;
 
@@ -23,4 +25,7 @@ void InitTxTypesAndRlpDecoders(INethermindApi api) { }
     Task InitRpcModules() => Task.CompletedTask;
 
     bool MustInitialize => false;
+
+    bool Enabled { get; }
+    IModule? ContainerModule => null;
 }

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System.Threading.Tasks;
+using Autofac;
 
 namespace Nethermind.Api.Extensions
 {

src/Nethermind/Nethermind.Api/IApiWithBlockchain.cs

@@ -17,6 +17,7 @@
 using Nethermind.Consensus.Scheduler;
 using Nethermind.Consensus.Validators;
 using Nethermind.Core;
+using Nethermind.Core.Container;
 using Nethermind.Evm.TransactionProcessing;
 using Nethermind.Facade;
 using Nethermind.Facade.Eth;
@@ -52,7 +53,7 @@ public interface IApiWithBlockchain : IApiWithStores, IBlockchainBridgeFactory
         /// <summary>
         /// PoS switcher for The Merge
         /// </summary>
-        IPoSSwitcher PoSSwitcher { get; set; }
+        IPoSSwitcher PoSSwitcher { get; }
         ISealer? Sealer { get; set; }
         ISealValidator? SealValidator { get; set; }
         ISealEngine SealEngine { get; set; }
@@ -93,20 +94,13 @@ 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)
-        {
-            return ConfigureContainerBuilderFromApiWithStores(builder)
-                .AddPropertiesFrom<IApiWithBlockchain>(this)
-                .AddSingleton<INodeStorage>(NodeStorageFactory.WrapKeyValueStore(DbProvider!.StateDb));
-        }
     }
 }

src/Nethermind/Nethermind.Api/IApiWithNetwork.cs

@@ -5,6 +5,7 @@
 using Autofac;
 using Nethermind.Consensus;
 using Nethermind.Core;
+using Nethermind.Core.Container;
 using Nethermind.Core.PubSub;
 using Nethermind.Grpc;
 using Nethermind.JsonRpc;
@@ -26,40 +27,27 @@ 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; }
+        ISessionMonitor? SessionMonitor { get; }
+        IStaticNodesManager? StaticNodesManager { get; }
         ISynchronizer? Synchronizer { get; }
         ISyncModeSelector SyncModeSelector { get; }
-        ISyncProgressResolver? SyncProgressResolver { get; }
-        IPivot? Pivot { get; set; }
-        ISyncPeerPool? SyncPeerPool { get; set; }
-        IPeerDifficultyRefreshPool? PeerDifficultyRefreshPool { get; set; }
-        ISyncServer? SyncServer { get; set; }
+        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<IApiWithNetwork>(this);
-        }
     }
 }

src/Nethermind/Nethermind.Api/IApiWithStores.cs

@@ -8,6 +8,7 @@
 using Nethermind.Blockchain.Receipts;
 using Nethermind.Consensus;
 using Nethermind.Core;
+using Nethermind.Core.Container;
 using Nethermind.Crypto;
 using Nethermind.Db.Blooms;
 using Nethermind.Facade.Find;
@@ -26,17 +27,13 @@ public interface IApiWithStores : IBasicApi
         ILogFinder? LogFinder { get; set; }
         ISigner? EngineSigner { get; set; }
         ISignerStore? EngineSignerStore { get; set; }
+
+        [ComponentKey(ComponentKey.NodeKey)]
         ProtectedPrivateKey? NodeKey { get; set; }
         IReceiptStorage? ReceiptStorage { get; set; }
         IReceiptFinder? ReceiptFinder { get; set; }
         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

@@ -11,12 +11,14 @@
 using Nethermind.Blockchain.Synchronization;
 using Nethermind.Config;
 using Nethermind.Core;
+using Nethermind.Core.Container;
 using Nethermind.Core.Specs;
 using Nethermind.Core.Timers;
 using Nethermind.Crypto;
 using Nethermind.Db;
 using Nethermind.KeyStore;
 using Nethermind.Logging;
+using Nethermind.Network.Config;
 using Nethermind.Serialization.Json;
 using Nethermind.Specs.ChainSpecStyle;
 using Nethermind.Synchronization;
@@ -28,46 +30,37 @@ public interface IBasicApi
         DisposableStack DisposeStack { get; }
 
         IAbiEncoder AbiEncoder { get; }
-        ChainSpec ChainSpec { get; set; }
-        IConfigProvider ConfigProvider { get; set; }
+        ChainSpec ChainSpec { get; }
+        IConfigProvider ConfigProvider { get; }
         ICryptoRandom CryptoRandom { get; }
         IDbProvider? DbProvider { get; set; }
         IDbFactory? DbFactory { get; set; }
         IEthereumEcdsa? EthereumEcdsa { get; set; }
-        IJsonSerializer EthereumJsonSerializer { get; set; }
+        IJsonSerializer EthereumJsonSerializer { get; }
         IFileSystem FileSystem { get; set; }
         IKeyStore? KeyStore { get; set; }
-        ILogManager LogManager { get; set; }
+        ILogManager LogManager { get; }
+        [SkipServiceCollection]
         ProtectedPrivateKey? OriginalSignerKey { get; set; }
         IReadOnlyList<INethermindPlugin> Plugins { get; }
         [SkipServiceCollection]
-        string SealEngineType { get; set; }
-        ISpecProvider? SpecProvider { get; set; }
-        IBetterPeerStrategy? BetterPeerStrategy { get; set; }
+        string SealEngineType { get; }
+        ISpecProvider? SpecProvider { get; }
+        IBetterPeerStrategy? BetterPeerStrategy { get; }
         ITimestamper Timestamper { get; }
         ITimerFactory TimerFactory { get; }
-        IProcessExitSource? ProcessExit { get; set; }
+        IProcessExitSource? ProcessExit { get; }
+        ILifetimeScope BaseContainer { get; }
 
         public IConsensusPlugin? GetConsensusPlugin() =>
             Plugins
                 .OfType<IConsensusPlugin>()
                 .SingleOrDefault(cp => cp.SealEngineType == SealEngineType);
 
         public IEnumerable<IConsensusWrapperPlugin> GetConsensusWrapperPlugins() =>
-            Plugins.OfType<IConsensusWrapperPlugin>().Where(p => p.Enabled);
+            Plugins.OfType<IConsensusWrapperPlugin>().Where(p => p.ConsensusWrapperEnabled);
 
         public IEnumerable<ISynchronizationPlugin> GetSynchronizationPlugins() =>
             Plugins.OfType<ISynchronizationPlugin>();
-
-        public ContainerBuilder ConfigureContainerBuilderFromBasicApi(ContainerBuilder builder)
-        {
-            builder
-                .AddPropertiesFrom<IBasicApi>(this)
-                .AddSingleton(ConfigProvider.GetConfig<ISyncConfig>());
-
-            DbProvider!.ConfigureServiceCollection(builder);
-
-            return builder;
-        }
     }
 }