NethermindEth
diff --git a/‎Directory.Packages.props‎
Lines changed: 1 addition & 1 deletion b/‎Directory.Packages.props‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Nethermind/Chains/volta.json‎
Lines changed: 250 additions & 235 deletions b/‎src/Nethermind/Chains/volta.json‎
Lines changed: 250 additions & 235 deletions
diff --git a/‎src/Nethermind/Ethereum.Test.Base/TestBlockhashProvider.cs‎
Lines changed: 5 additions & 1 deletion b/‎src/Nethermind/Ethereum.Test.Base/TestBlockhashProvider.cs‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎src/Nethermind/Nethermind.Analytics/AnalyticsPlugin.cs‎
Lines changed: 25 additions & 68 deletions b/‎src/Nethermind/Nethermind.Analytics/AnalyticsPlugin.cs‎
Lines changed: 25 additions & 68 deletions
diff --git a/‎src/Nethermind/Nethermind.Analytics/AnalyticsSteps.cs‎
Lines changed: 49 additions & 0 deletions b/‎src/Nethermind/Nethermind.Analytics/AnalyticsSteps.cs‎
Lines changed: 49 additions & 0 deletions
diff --git a/‎src/Nethermind/Nethermind.Analytics/Nethermind.Analytics.csproj‎
Lines changed: 1 addition & 0 deletions b/‎src/Nethermind/Nethermind.Analytics/Nethermind.Analytics.csproj‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Nethermind/Nethermind.Api/IApiWithBlockchain.cs‎
Lines changed: 0 additions & 4 deletions b/‎src/Nethermind/Nethermind.Api/IApiWithBlockchain.cs‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎src/Nethermind/Nethermind.Api/IApiWithNetwork.cs‎
Lines changed: 0 additions & 8 deletions b/‎src/Nethermind/Nethermind.Api/IApiWithNetwork.cs‎
Lines changed: 0 additions & 8 deletions
diff --git a/‎src/Nethermind/Nethermind.Api/NethermindApi.cs‎
Lines changed: 0 additions & 10 deletions b/‎src/Nethermind/Nethermind.Api/NethermindApi.cs‎
Lines changed: 0 additions & 10 deletions
diff --git a/‎src/Nethermind/Nethermind.AuRa.Test/Contract/ValidatorContractTests.cs‎
Lines changed: 1 addition & 1 deletion b/‎src/Nethermind/Nethermind.AuRa.Test/Contract/ValidatorContractTests.cs‎
Lines changed: 1 addition & 1 deletion
@@ -54,7 +54,7 @@
     <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" />
-    <PackageVersion Include="Nethermind.Gmp" Version="1.0.1" />
+    <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.Numerics.Int256" Version="1.3.6" />
 
@@ -3,13 +3,17 @@
 
 using Nethermind.Core;
 using Nethermind.Core.Crypto;
+using Nethermind.Core.Specs;
 using Nethermind.Evm;
 
 namespace Ethereum.Test.Base
 {
     public class TestBlockhashProvider : IBlockhashProvider
     {
-        public Hash256 GetBlockhash(BlockHeader currentBlock, in long number)
+        public Hash256 GetBlockhash(BlockHeader currentBlock, long number)
+            => GetBlockhash(currentBlock, number, null);
+
+        public Hash256? GetBlockhash(BlockHeader currentBlock, long number, IReleaseSpec? spec)
         {
             if (number != 0)
                 return Keccak.Zero;
 
@@ -2,27 +2,26 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 
-using System.Collections.Generic;
 using System.Threading.Tasks;
+using Autofac;
+using Autofac.Core;
+using Nethermind.Analytics;
 using Nethermind.Api;
 using Nethermind.Api.Extensions;
+using Nethermind.Api.Steps;
+using Nethermind.Core;
 using Nethermind.Core.PubSub;
 using Nethermind.JsonRpc.Modules;
-using Nethermind.TxPool;
+using Nethermind.Serialization.Json.PubSub;
 
 namespace Nethermind.Analytics
 {
     public class AnalyticsPlugin(IInitConfig initConfig, IAnalyticsConfig analyticsConfig) : INethermindPlugin
     {
-        private IList<IPublisher> _publishers;
-        private INethermindApi _api;
-
-        private bool _isOn = initConfig.WebSocketsEnabled &&
-                             (analyticsConfig.PluginsEnabled ||
-                              analyticsConfig.StreamBlocks ||
-                              analyticsConfig.StreamTransactions);
-
-        public bool Enabled => _isOn;
+        public bool Enabled => initConfig.WebSocketsEnabled &&
+                               (analyticsConfig.PluginsEnabled ||
+                                analyticsConfig.StreamBlocks ||
+                                analyticsConfig.StreamTransactions);
 
         public ValueTask DisposeAsync() { return ValueTask.CompletedTask; }
 
@@ -32,65 +31,23 @@ public class AnalyticsPlugin(IInitConfig initConfig, IAnalyticsConfig analyticsC
 
         public string Author => "Nethermind";
 
-        public Task Init(INethermindApi api)
-        {
-            _api = api;
-            var (getFromAPi, _) = _api.ForInit;
-
-            if (!_isOn)
-            {
-                if (!initConfig.WebSocketsEnabled)
-                {
-                    getFromAPi.LogManager.GetClassLogger().Warn($"{nameof(AnalyticsPlugin)} disabled due to {nameof(initConfig.WebSocketsEnabled)} set to false");
-                }
-                else
-                {
-                    getFromAPi.LogManager.GetClassLogger().Warn($"{nameof(AnalyticsPlugin)} plugin disabled due to {nameof(AnalyticsConfig)} settings set to false");
-                }
-            }
-
-            return Task.CompletedTask;
-        }
-
-        private void TxPoolOnNewDiscovered(object sender, TxEventArgs e)
-        {
-            if (analyticsConfig.StreamTransactions)
-            {
-                foreach (IPublisher publisher in _publishers)
-                {
-                    // TODO: probably need to serialize first
-                    publisher.PublishAsync(e.Transaction);
-                }
-            }
-        }
-
-        public Task InitNetworkProtocol()
-        {
-            var (getFromAPi, _) = _api.ForNetwork;
-            if (_isOn)
-            {
-                getFromAPi.TxPool!.NewDiscovered += TxPoolOnNewDiscovered;
-            }
+        public IModule Module => new AnalyticsModule();
+    }
+}
 
-            if (_isOn)
-            {
-                AnalyticsWebSocketsModule webSocketsModule = new(getFromAPi.EthereumJsonSerializer, getFromAPi.LogManager);
-                getFromAPi.WebSocketsManager!.AddModule(webSocketsModule, true);
-                getFromAPi.Publishers.Add(webSocketsModule);
-            }
+public class AnalyticsModule : Module
+{
+    protected override void Load(ContainerBuilder builder) => builder
 
-            _publishers = getFromAPi.Publishers;
+        // Standard IPublishers, which seems to be things that publish when txpool got transaction
+        .AddSingleton<AnalyticsWebSocketsModule>()
+            .Bind<IPublisher, AnalyticsWebSocketsModule>() // send to websocket
+        .AddSingleton<IPublisher, LogPublisher>() // Send to log
 
-            return Task.CompletedTask;
-        }
+        // Rpc
+        .RegisterSingletonJsonRpcModule<IAnalyticsRpcModule, AnalyticsRpcModule>()
 
-        public Task InitRpcModules()
-        {
-            var (getFromAPi, _) = _api.ForRpc;
-            AnalyticsRpcModule analyticsRpcModule = new(
-                getFromAPi.BlockTree, getFromAPi.StateReader, getFromAPi.LogManager);
-            getFromAPi.RpcModuleProvider.Register(new SingletonModulePool<IAnalyticsRpcModule>(analyticsRpcModule));
-            return Task.CompletedTask;
-        }
-    }
+        // Step
+        .AddStep(typeof(AnalyticsSteps))
+    ;
 }
@@ -0,0 +1,49 @@
+// SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Nethermind.Analytics;
+using Nethermind.Api.Steps;
+using Nethermind.Core.PubSub;
+using Nethermind.Init.Steps;
+using Nethermind.Sockets;
+using Nethermind.TxPool;
+
+/// <summary>
+/// Publish txpool `NewDiscovered` event to all `IPublisher`.
+/// </summary>
+/// <param name="txPool"></param>
+/// <param name="webSocketsModule"></param>
+/// <param name="webSocketsManager"></param>
+/// <param name="analyticsConfig"></param>
+/// <param name="publishers"></param>
+[RunnerStepDependencies(typeof(InitializeBlockchain))]
+public class AnalyticsSteps(
+    ITxPool txPool,
+    AnalyticsWebSocketsModule webSocketsModule,
+    IWebSocketsManager webSocketsManager,
+    IAnalyticsConfig analyticsConfig,
+    IPublisher[] publishers
+) : IStep
+{
+    public Task Execute(CancellationToken cancellationToken)
+    {
+        txPool.NewDiscovered += TxPoolOnNewDiscovered;
+        webSocketsManager!.AddModule(webSocketsModule, true);
+        return Task.CompletedTask;
+    }
+
+    private void TxPoolOnNewDiscovered(object sender, TxEventArgs e)
+    {
+        if (analyticsConfig.StreamTransactions)
+        {
+            foreach (IPublisher publisher in publishers)
+            {
+                // TODO: probably need to serialize first
+                publisher.PublishAsync(e.Transaction);
+            }
+        }
+    }
+}
@@ -2,6 +2,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Nethermind.Api\Nethermind.Api.csproj" />
+    <ProjectReference Include="..\Nethermind.Init\Nethermind.Init.csproj" />
   </ItemGroup>
 
 </Project>
@@ -79,10 +79,6 @@ public interface IApiWithBlockchain : IApiWithStores, IBlockchainBridgeFactory
 
         IGasPriceOracle GasPriceOracle { get; }
 
-        [SkipServiceCollection]
-        IEthSyncingInfo? EthSyncingInfo { get; }
-
-
         IBlockProductionPolicy? BlockProductionPolicy { get; set; }
         BackgroundTaskScheduler BackgroundTaskScheduler { get; set; }
         CensorshipDetector CensorshipDetector { get; set; }
 
@@ -1,19 +1,14 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using System.Collections.Generic;
 using Nethermind.Consensus;
 using Nethermind.Core;
-using Nethermind.Core.PubSub;
-using Nethermind.Grpc;
 using Nethermind.JsonRpc;
 using Nethermind.JsonRpc.Modules;
-using Nethermind.JsonRpc.Modules.Subscribe;
 using Nethermind.Network;
 using Nethermind.Network.Rlpx;
 using Nethermind.Synchronization;
 using Nethermind.Synchronization.Peers;
-using Nethermind.Sockets;
 using Nethermind.Synchronization.ParallelSync;
 
 namespace Nethermind.Api
@@ -22,14 +17,12 @@ public interface IApiWithNetwork : IApiWithBlockchain
     {
         (IApiWithNetwork GetFromApi, IApiWithNetwork SetInApi) ForNetwork => (this, this);
 
-        IGrpcServer? GrpcServer { get; set; }
         IIPResolver IpResolver { get; }
         IMessageSerializationService MessageSerializationService { get; }
         IGossipPolicy GossipPolicy { get; set; }
         IPeerManager? PeerManager { get; }
         IProtocolsManager? ProtocolsManager { get; set; }
         IProtocolValidator? ProtocolValidator { get; set; }
-        IList<IPublisher> Publishers { get; }
         IRlpxHost RlpxPeer { get; }
 
         [SkipServiceCollection]
@@ -41,7 +34,6 @@ public interface IApiWithNetwork : IApiWithBlockchain
         ISyncModeSelector SyncModeSelector { get; }
         ISyncPeerPool? SyncPeerPool { get; }
         ISyncServer? SyncServer { get; }
-        IWebSocketsManager WebSocketsManager { get; set; }
 
         [SkipServiceCollection]
         IEngineRequestsTracker EngineRequestsTracker { get; }
 
@@ -18,16 +18,12 @@
 using Nethermind.Consensus.Scheduler;
 using Nethermind.Consensus.Validators;
 using Nethermind.Core;
-using Nethermind.Core.Authentication;
-using Nethermind.Core.PubSub;
 using Nethermind.Core.Specs;
 using Nethermind.Core.Timers;
 using Nethermind.Crypto;
 using Nethermind.Db;
 using Nethermind.Db.Blooms;
 using Nethermind.Facade;
-using Nethermind.Facade.Eth;
-using Nethermind.Grpc;
 using Nethermind.JsonRpc;
 using Nethermind.JsonRpc.Modules;
 using Nethermind.JsonRpc.Modules.Eth.GasPrice;
@@ -44,7 +40,6 @@
 using Nethermind.Synchronization.Peers;
 using Nethermind.TxPool;
 using Nethermind.Wallet;
-using Nethermind.Sockets;
 using Nethermind.Consensus.Processing.CensorshipDetector;
 using Nethermind.Facade.Find;
 
@@ -96,7 +91,6 @@ public virtual IBlockchainBridge CreateBlockchainBridge()
         public IEthereumEcdsa EthereumEcdsa => Context.Resolve<IEthereumEcdsa>();
         public IFileSystem FileSystem { get; set; } = new FileSystem();
         public IUnclesValidator? UnclesValidator => Context.Resolve<IUnclesValidator>();
-        public IGrpcServer? GrpcServer { get; set; }
         public IHeaderValidator? HeaderValidator => Context.Resolve<IHeaderValidator>();
         public IEngineRequestsTracker EngineRequestsTracker => Context.Resolve<IEngineRequestsTracker>();
 
@@ -148,15 +142,12 @@ public virtual IBlockchainBridge CreateBlockchainBridge()
         public IBlockProducerEnvFactory BlockProducerEnvFactory => Context.Resolve<IBlockProducerEnvFactory>();
         public IBlockImprovementContextFactory? BlockImprovementContextFactory { get; set; }
         public IGasPriceOracle GasPriceOracle => Context.Resolve<IGasPriceOracle>();
-
-        public IEthSyncingInfo? EthSyncingInfo => Context.Resolve<IEthSyncingInfo>();
         public IBlockProductionPolicy? BlockProductionPolicy { get; set; }
         public BackgroundTaskScheduler BackgroundTaskScheduler { get; set; } = null!;
         public CensorshipDetector CensorshipDetector { get; set; } = null!;
         public IWallet? Wallet { get; set; }
         public IBadBlockStore? BadBlocksStore { get; set; }
         public ITransactionComparerProvider? TransactionComparerProvider { get; set; }
-        public IWebSocketsManager WebSocketsManager { get; set; } = new WebSocketsManager();
 
         public IProtectedPrivateKey? NodeKey { get; set; }
 
@@ -168,7 +159,6 @@ public virtual IBlockchainBridge CreateBlockchainBridge()
         public ChainSpec ChainSpec => _dependencies.ChainSpec;
         public IDisposableStack DisposeStack => Context.Resolve<IDisposableStack>();
         public IReadOnlyList<INethermindPlugin> Plugins => _dependencies.Plugins;
-        public IList<IPublisher> Publishers { get; } = new List<IPublisher>(); // this should be called publishers
         public IProcessExitSource ProcessExit => _dependencies.ProcessExitSource;
         public CompositeTxGossipPolicy TxGossipPolicy { get; } = new();
         public ILifetimeScope Context => _dependencies.Context;
 
@@ -83,7 +83,7 @@ public void finalize_change_should_call_correct_transaction()
             contract.FinalizeChange(_block.Header);
 
             _transactionProcessor.Received().Execute(
-                Arg.Is<Transaction>(t => IsEquivalentTo(expectation, t)), Arg.Is<BlockExecutionContext>(blkCtx => blkCtx.Header.Equals(_block.Header)), Arg.Any<ITxTracer>());
+                Arg.Is<Transaction>(t => IsEquivalentTo(expectation, t)), Arg.Is<BlockHeader>(header => header.Equals(_block.Header)), Arg.Any<ITxTracer>());
         }
 
         private static bool IsEquivalentTo(Transaction expected, Transaction item)
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,17 @@`
`3`	`3`
`4`	`4`	`using Nethermind.Core;`
`5`	`5`	`using Nethermind.Core.Crypto;`
	`6`	`+using Nethermind.Core.Specs;`
`6`	`7`	`using Nethermind.Evm;`
`7`	`8`
`8`	`9`	`namespace Ethereum.Test.Base`
`9`	`10`	`{`
`10`	`11`	`public class TestBlockhashProvider : IBlockhashProvider`
`11`	`12`	`{`
`12`		`- public Hash256 GetBlockhash(BlockHeader currentBlock, in long number)`
	`13`	`+ public Hash256 GetBlockhash(BlockHeader currentBlock, long number)`
	`14`	`+ => GetBlockhash(currentBlock, number, null);`
	`15`	`+`
	`16`	`+ public Hash256? GetBlockhash(BlockHeader currentBlock, long number, IReleaseSpec? spec)`
`13`	`17`	`{`
`14`	`18`	`if (number != 0)`
`15`	`19`	`return Keccak.Zero;`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public void finalize_change_should_call_correct_transaction()`
`83`	`83`	`contract.FinalizeChange(_block.Header);`
`84`	`84`
`85`	`85`	`_transactionProcessor.Received().Execute(`
`86`		`- Arg.Is<Transaction>(t => IsEquivalentTo(expectation, t)), Arg.Is<BlockExecutionContext>(blkCtx => blkCtx.Header.Equals(_block.Header)), Arg.Any<ITxTracer>());`
	`86`	`+ Arg.Is<Transaction>(t => IsEquivalentTo(expectation, t)), Arg.Is<BlockHeader>(header => header.Equals(_block.Header)), Arg.Any<ITxTracer>());`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`private static bool IsEquivalentTo(Transaction expected, Transaction item)`