Use single container

Author: asdacap

src/Nethermind/Nethermind.Api/IApiWithBlockchain.cs

@@ -17,6 +17,7 @@
 using Nethermind.Consensus.Scheduler;
 using Nethermind.Consensus.Validators;
 using Nethermind.Core;
+using Nethermind.Era1;
 using Nethermind.Evm.TransactionProcessing;
 using Nethermind.Facade;
 using Nethermind.Facade.Eth;
@@ -104,6 +105,8 @@ public interface IApiWithBlockchain : IApiWithStores, IBlockchainBridgeFactory
         BackgroundTaskScheduler BackgroundTaskScheduler { get; set; }
         CensorshipDetector CensorshipDetector { get; set; }
 
+        IAdminEraService AdminEraService { get; set; }
+
         public ContainerBuilder ConfigureContainerBuilderFromApiWithBlockchain(ContainerBuilder builder)
         {
             return ConfigureContainerBuilderFromApiWithStores(builder)

src/Nethermind/Nethermind.Api/INethermindApi.cs

@@ -4,6 +4,7 @@
 #nullable enable
 using System;
 using Nethermind.Config;
+using Nethermind.Era1;
 using Nethermind.Facade.Eth;
 using Nethermind.Facade.Eth.RpcTransaction;
 using Nethermind.Serialization.Rlp;

src/Nethermind/Nethermind.Api/NethermindApi.cs

@@ -57,6 +57,7 @@
 using Nethermind.Sockets;
 using Nethermind.Trie;
 using Nethermind.Consensus.Processing.CensorshipDetector;
+using Nethermind.Era1;
 using Nethermind.Facade.Find;
 using Nethermind.Synchronization.FastSync;
 
@@ -226,6 +227,7 @@ public ISealEngine SealEngine
         public INodeStorageFactory NodeStorageFactory { get; set; } = null!;
         public BackgroundTaskScheduler BackgroundTaskScheduler { get; set; } = null!;
         public CensorshipDetector CensorshipDetector { get; set; } = null!;
+        public IAdminEraService AdminEraService { get; set; } = null!;
         public IWallet? Wallet { get; set; }
         public IBadBlockStore? BadBlocksStore { get; set; }
         public ITransactionComparerProvider? TransactionComparerProvider { get; set; }

src/Nethermind/Nethermind.Init/Steps/EraStep.cs

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Autofac;
@@ -22,9 +23,13 @@ public EraStep(INethermindApi api)
 
     public async Task Execute(CancellationToken cancellationToken)
     {
-        await using IContainer container = _api.ConfigureContainerBuilderFromApiWithBlockchain(new ContainerBuilder())
+        IContainer container = _api.ConfigureContainerBuilderFromApiWithBlockchain(new ContainerBuilder())
             .AddModule(new EraModule())
             .Build();
+
+        _api.DisposeStack.Push((IAsyncDisposable) container);
+        _api.AdminEraService = container.Resolve<IAdminEraService>();
+
         await container.Resolve<EraCliRunner>().Run(cancellationToken);
     }
 }

src/Nethermind/Nethermind.Init/Steps/RegisterRpcModules.cs

@@ -124,11 +124,6 @@ public virtual async Task Execute(CancellationToken cancellationToken)
         StepDependencyException.ThrowIfNull(_api.StaticNodesManager);
         StepDependencyException.ThrowIfNull(_api.Enode);
 
-        IContainer eraContainer = _api.ConfigureContainerBuilderFromApiWithBlockchain(new ContainerBuilder())
-            .AddModule(new EraModule())
-            .Build();
-        _api.DisposeStack.Push((IAsyncDisposable)eraContainer);
-
         ManualPruningTrigger pruningTrigger = new();
         _api.PruningTrigger.Add(pruningTrigger);
         (IApiWithStores getFromApi, IApiWithBlockchain setInApi) = _api.ForInit;
@@ -141,7 +136,7 @@ public virtual async Task Execute(CancellationToken cancellationToken)
             _api.BlockingVerifyTrie!,
             _api.WorldStateManager.GlobalStateReader,
             _api.Enode,
-            eraContainer.Resolve<IAdminEraService>(),
+            _api.AdminEraService,
             initConfig.BaseDbPath,
             pruningTrigger,
             getFromApi.ChainSpec.Parameters);