Produce block on main world state

src/Nethermind.Arbitrum.Test/BlockProcessing/BlockProcessorTests.cs

@@ -8,6 +8,7 @@
 using Nethermind.Arbitrum.Test.Precompiles;
 using Nethermind.Blockchain.Tracing;
 using Nethermind.Consensus.Processing;
+using Nethermind.Consensus.Producers;
 using Nethermind.Core;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Test.Builders;
@@ -89,6 +90,9 @@ public void ProcessTransactions_SubmitRetryable_CreatesRetryTx()
             IWorldState worldState = chain.WorldStateManager.GlobalWorldState;
             using var dispose = worldState.BeginScope(chain.BlockTree.Head!.Header);
 
+            BlockToProduce blockToProduce = new BlockToProduce(newBlock.Header, newBlock.Transactions, [],
+                null);
+
             var arbosState = ArbosState.OpenArbosState(worldState, new SystemBurner(),
                 LimboLogs.Instance.GetLogger("arbosState"));
             newBlock.Header.BaseFeePerGas = arbosState.L2PricingState.BaseFeeWeiStorage.Get();
@@ -101,9 +105,9 @@ public void ProcessTransactions_SubmitRetryable_CreatesRetryTx()
             };
 
             var blockTracer = new BlockReceiptsTracer();
-            blockTracer.StartNewBlockTrace(newBlock);
+            blockTracer.StartNewBlockTrace(blockToProduce);
 
-            chain.BlockProcessor.ProcessOne(newBlock, ProcessingOptions.ProducingBlock, blockTracer, chain.SpecProvider.GenesisSpec);
+            chain.BlockProcessor.ProcessOne(blockToProduce, ProcessingOptions.ProducingBlock, blockTracer, chain.SpecProvider.GenesisSpec);
 
             blockTracer.EndBlockTrace();
 

src/Nethermind.Arbitrum.Test/BlockProcessing/BlockProducerTests.cs

@@ -87,14 +87,18 @@ public void BuildBlock_SignedTransaction_RecoversSenderAddressFromSignature()
             };
 
             ArbitrumRpcTestBlockchain chain = ArbitrumRpcTestBlockchain.CreateDefault(preConfigurer);
-            using var dispose = chain.WorldStateManager.GlobalWorldState.BeginScope(chain.BlockTree.Head!.Header);
-            ArbosState arbosState = ArbosState.OpenArbosState(chain.WorldStateManager.GlobalWorldState,
-                new SystemBurner(), LimboNoErrorLogger.Instance);
+            UInt256 gasPrice = UInt256.Zero;
+            using (chain.WorldStateManager.GlobalWorldState.BeginScope(chain.BlockTree.Head!.Header))
+            {
+                ArbosState arbosState = ArbosState.OpenArbosState(chain.WorldStateManager.GlobalWorldState,
+                    new SystemBurner(), LimboNoErrorLogger.Instance);
+                gasPrice = arbosState.L2PricingState.BaseFeeWeiStorage.Get();
+            }
 
             var ethereumEcdsa = new EthereumEcdsa(chain.SpecProvider.ChainId);
             Transaction transaction = Build.A.Transaction
                 .WithGasLimit(GasCostOf.Transaction)
-                .WithGasPrice(arbosState.L2PricingState.BaseFeeWeiStorage.Get())
+                .WithGasPrice(gasPrice)
                 .WithNonce(0)
                 .WithValue(1.Ether())
                 .To(TestItem.AddressB)

src/Nethermind.Arbitrum.Test/Config/ArbitrumChainSpecProviderTests.cs

@@ -26,7 +26,7 @@ public void ChainSpecProvider_SeveralLifetimeScopes_OneSpecProviderPerScope()
             chainSpec.EngineChainSpecParametersProvider.GetChainSpecParameters<ArbitrumChainSpecEngineParameters>();
         engineParameters.InitialArbOSVersion = 10;
 
-        ArbitrumModule module = new(chainSpec);
+        ArbitrumModule module = new(chainSpec, new BlocksConfig());
 
         ContainerBuilder containerBuilder = new();
         containerBuilder.AddModule(new TestNethermindModule(new ConfigProvider(), chainSpec));
@@ -84,7 +84,7 @@ public void ChainSpecProvider_WhenArbOSVersionChanges_ReturnsCorrectSpec()
     {
         ChainSpec chainSpec = FullChainSimulationChainSpecProvider.Create();
 
-        ArbitrumModule module = new(chainSpec);
+        ArbitrumModule module = new(chainSpec, new BlocksConfig());
 
         ContainerBuilder containerBuilder = new();
         //explicitly state we won't use TestSpecProvider

src/Nethermind.Arbitrum.Test/Infrastructure/ArbitrumRpcTestBlockchain.cs

@@ -251,6 +251,7 @@ private static ArbitrumRpcTestBlockchain CreateInternal(ArbitrumRpcTestBlockchai
                 chain.Container.Resolve<IArbitrumConfig>(),
                 new Nethermind.Arbitrum.Config.VerifyBlockHashConfig(), // Disabled for tests
                 new Nethermind.Serialization.Json.EthereumJsonSerializer(),
+                chain.Container.Resolve<IBlocksConfig>(),
                 null) // No ProcessExitSource in tests
             .Create());
 

src/Nethermind.Arbitrum.Test/Infrastructure/ArbitrumTestBlockchainBase.cs

@@ -137,6 +137,9 @@ protected virtual ArbitrumTestBlockchainBase Build(Action<ContainerBuilder>? con
         JsonSerializer = new EthereumJsonSerializer();
 
         IConfigProvider configProvider = new ConfigProvider(arbitrumConfig);
+        //it's a mess... but we need to ensure that both configs are in sync
+        configProvider.GetConfig<IBlocksConfig>().BuildBlocksOnMainState = true;
+        this.BlocksConfig.BuildBlocksOnMainState = true;
 
         ContainerBuilder builder = ConfigureContainer(new ContainerBuilder(), configProvider);
         configurer?.Invoke(builder);
@@ -163,22 +166,14 @@ protected virtual ArbitrumTestBlockchainBase Build(Action<ContainerBuilder>? con
         TransactionComparerProvider transactionComparerProvider = new(Dependencies.SpecProvider, BlockFinder);
 
         BlockProducer = CreateTestBlockProducer(Dependencies.Sealer, transactionComparerProvider);
+
         BlockProducerRunner = new StandardBlockProducerRunner(BlockProductionTrigger, BlockTree, BlockProducer);
+        _ = new NonProcessingProducedBlockSuggester(BlockTree, BlockProducerRunner);
         BlockProducerRunner.Start();
 
-        Suggester = new ProducedBlockSuggester(BlockTree, BlockProducerRunner);
-
         RegisterTransactionDecoders();
 
         Cts = AutoCancelTokenSource.ThatCancelAfter(TimeSpan.FromMilliseconds(TestTimout));
-        //TestUtil = new TestBlockchainUtil(
-        //    BlockProducerRunner,
-        //    BlockProductionTrigger,
-        //    Timestamper,
-        //    BlockTree,
-        //    TxPool,
-        //    1
-        //);
 
         Configuration testConfig = Container.Resolve<Configuration>();
         IWorldState worldState = WorldStateManager.GlobalWorldState;
@@ -277,7 +272,7 @@ protected virtual ContainerBuilder ConfigureContainer(ContainerBuilder builder,
         return builder
             .AddModule(new PseudoNethermindModule(ChainSpec, configProvider, LimboLogs.Instance))
             .AddModule(new TestEnvironmentModule(TestItem.PrivateKeyA, Random.Shared.Next().ToString()))
-            .AddModule(new ArbitrumModule(ChainSpec))
+            .AddModule(new ArbitrumModule(ChainSpec, configProvider.GetConfig<IBlocksConfig>()))
             .AddSingleton<IDbFactory>(new MemDbFactory())
             .AddSingleton<ISpecProvider>(FullChainSimulationSpecProvider.Instance)
             .AddSingleton<Configuration>()
@@ -287,7 +282,6 @@ protected virtual ContainerBuilder ConfigureContainer(ContainerBuilder builder,
             .AddDecorator<IRocksDbConfigFactory, ArbitrumDbConfigFactory>()
             .AddSingleton<IWasmDb, WasmDb>()
 
-            .AddSingleton<IBlockProducerEnvFactory, ArbitrumBlockProducerEnvFactory>()
             .AddSingleton<IBlockProducerTxSourceFactory, ArbitrumBlockProducerTxSourceFactory>()
             .AddDecorator<ICodeInfoRepository, ArbitrumCodeInfoRepository>()
 

src/Nethermind.Arbitrum.Test/Rpc/ArbitrumRpcModuleTests.cs

@@ -31,7 +31,7 @@ public abstract class ArbitrumRpcModuleTests
         private const ulong GenesisBlockNum = 1000UL;
 
         private ArbitrumBlockTreeInitializer _initializer = null!;
-        private Mock<IBlocksConfig> _blockConfigMock = null!;
+        private IBlocksConfig _blockConfig = null!;
         private Mock<IBlockTree> _blockTreeMock = null!;
         private Mock<IManualBlockProductionTrigger> _triggerMock = null!;
         private ArbitrumRpcTxSource _txSource = null!;
@@ -47,7 +47,8 @@ public abstract class ArbitrumRpcModuleTests
         public void Setup()
         {
             _worldStateManagerMock = new Mock<IWorldStateManager>();
-            _blockConfigMock = new Mock<IBlocksConfig>();
+            _blockConfig = new BlocksConfig();
+            _blockConfig.BuildBlocksOnMainState = true;
             _blockTreeMock = new Mock<IBlockTree>();
             _triggerMock = new Mock<IManualBlockProductionTrigger>();
             _logManager = LimboLogs.Instance;
@@ -60,7 +61,7 @@ public void Setup()
                 _specHelper.Object,
                 _worldStateManagerMock.Object,
                 _blockTreeMock.Object,
-                _blockConfigMock.Object,
+                _blockConfig,
                 _logManager);
 
             _specHelper.SetupGet(x => x.GenesisBlockNum).Returns(GenesisBlockNum);
@@ -80,7 +81,8 @@ public void Setup()
                 _logManager,
                 cachedL1PriceData,
                 _blockProcessingQueue.Object,
-                _arbitrumConfig);
+                _arbitrumConfig,
+                _blockConfig);
         }
 
         [Test]
@@ -241,7 +243,8 @@ public async Task HeadMessageIndex_Always_ReturnsHeadMessageIndex()
                 _logManager,
                 cachedL1PriceData,
                 _blockProcessingQueue.Object,
-                _arbitrumConfig);
+                _arbitrumConfig,
+                _blockConfig);
 
             _specHelper.Setup(c => c.GenesisBlockNum).Returns((ulong)genesis.Number);
 
@@ -271,7 +274,8 @@ public async Task HeadMessageIndex_HasNoBlocks_NoLatestHeaderFound()
                 _logManager,
                 cachedL1PriceData,
                 _blockProcessingQueue.Object,
-                _arbitrumConfig);
+                _arbitrumConfig,
+                _blockConfig);
 
             var result = await _rpcModule.HeadMessageIndex();
 
@@ -307,7 +311,8 @@ public async Task HeadMessageIndex_BlockNumberIsLowerThanGenesis_Fails()
                 _logManager,
                 cachedL1PriceData,
                 _blockProcessingQueue.Object,
-                _arbitrumConfig);
+                _arbitrumConfig,
+                _blockConfig);
 
             _specHelper.Setup(c => c.GenesisBlockNum).Returns(genesisBlockNum);
 

src/Nethermind.Arbitrum.slnx

@@ -41,7 +41,6 @@
     <Project Path="Nethermind/src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj" />
     <Project Path="Nethermind/src/Nethermind/Nethermind.JsonRpc.Test/Nethermind.JsonRpc.Test.csproj" />
     <Project Path="Nethermind/src/Nethermind/Nethermind.Monitoring.Test/Nethermind.Monitoring.Test.csproj" />
-    <Project Path="Nethermind/src/Nethermind/Nethermind.Overseer.Test/Nethermind.Overseer.Test.csproj" />
     <Project Path="Nethermind/src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj" />
     <Project Path="Nethermind/src/Nethermind/Nethermind.Specs.Test/Nethermind.Specs.Test.csproj" />
     <Project Path="Nethermind/src/Nethermind/Nethermind.Evm.Test/Nethermind.Evm.Test.csproj" />

src/Nethermind.Arbitrum/ArbitrumPlugin.cs

@@ -37,7 +37,7 @@
 
 namespace Nethermind.Arbitrum;
 
-public class ArbitrumPlugin(ChainSpec chainSpec) : IConsensusPlugin
+public class ArbitrumPlugin(ChainSpec chainSpec, IBlocksConfig blocksConfig) : IConsensusPlugin
 {
     private ArbitrumNethermindApi _api = null!;
     private IJsonRpcConfig _jsonRpcConfig = null!;
@@ -47,7 +47,7 @@ public class ArbitrumPlugin(ChainSpec chainSpec) : IConsensusPlugin
     public string Description => "Nethermind Arbitrum client";
     public string Author => "Nethermind";
     public bool Enabled => chainSpec.SealEngineType == ArbitrumChainSpecEngineParameters.ArbitrumEngineName;
-    public IModule Module => new ArbitrumModule(chainSpec);
+    public IModule Module => new ArbitrumModule(chainSpec, blocksConfig);
     public Type ApiType => typeof(ArbitrumNethermindApi);
 
     public Task Init(INethermindApi api)
@@ -91,6 +91,7 @@ public Task InitRpcModules()
             _api.Config<IArbitrumConfig>(),
             _api.Config<IVerifyBlockHashConfig>(),
             _api.EthereumJsonSerializer,
+            _api.Config<IBlocksConfig>(),
             _api.ProcessExit
         );
 
@@ -156,7 +157,7 @@ public class ArbitrumGasLimitCalculator : IGasLimitCalculator
     public long GetGasLimit(BlockHeader parentHeader) => long.MaxValue;
 }
 
-public class ArbitrumModule(ChainSpec chainSpec) : Module
+public class ArbitrumModule(ChainSpec chainSpec, IBlocksConfig blocksConfig) : Module
 {
     protected override void Load(ContainerBuilder builder)
     {
@@ -194,7 +195,6 @@ protected override void Load(ContainerBuilder builder)
             .AddScoped<BlockProcessor.IBlockProductionTransactionPicker, ISpecProvider, IBlocksConfig>((specProvider, blocksConfig) =>
                 new ArbitrumBlockProductionTransactionPicker(specProvider))
 
-            .AddSingleton<IBlockProducerEnvFactory, ArbitrumBlockProducerEnvFactory>()
             .AddSingleton<IBlockProducerTxSourceFactory, ArbitrumBlockProducerTxSourceFactory>()
             .AddDecorator<ICodeInfoRepository, ArbitrumCodeInfoRepository>()
             .AddScoped<IArbosVersionProvider, ArbosStateVersionProvider>()
@@ -205,6 +205,11 @@ protected override void Load(ContainerBuilder builder)
             // Rpcs
             .AddSingleton<ArbitrumEthModuleFactory>()
             .Bind<IRpcModuleFactory<IEthRpcModule>, ArbitrumEthModuleFactory>();
+
+        if (blocksConfig.BuildBlocksOnMainState)
+            builder.AddSingleton<IBlockProducerEnvFactory, ArbitrumGlobalWorldStateBlockProducerEnvFactory>();
+        else
+            builder.AddSingleton<IBlockProducerEnvFactory, ArbitrumBlockProducerEnvFactory>();
     }
 
     private class ArbitrumBlockValidationModule : Module, IBlockValidationModule

src/Nethermind.Arbitrum/ArbitrumRpcModuleFactory.cs

@@ -30,21 +30,22 @@ public sealed class ArbitrumRpcModuleFactory(
     IArbitrumConfig arbitrumConfig,
     IVerifyBlockHashConfig verifyBlockHashConfig,
     IJsonSerializer jsonSerializer,
+    IBlocksConfig blocksConfig,
     IProcessExitSource? processExitSource = null) : ModuleFactoryBase<IArbitrumRpcModule>
 {
     public override IArbitrumRpcModule Create()
     {
         if (!verifyBlockHashConfig.Enabled || string.IsNullOrWhiteSpace(verifyBlockHashConfig.ArbNodeRpcUrl))
             return new ArbitrumRpcModule(
                 initializer, blockTree, trigger, txSource, chainSpec, specHelper,
-                logManager, cachedL1PriceData, processingQueue, arbitrumConfig);
+                logManager, cachedL1PriceData, processingQueue, arbitrumConfig, blocksConfig);
 
         ILogger logger = logManager.GetClassLogger<ArbitrumRpcModule>();
         if (logger.IsInfo)
             logger.Info($"Block hash verification enabled: verify every {verifyBlockHashConfig.VerifyEveryNBlocks} blocks, url={verifyBlockHashConfig.ArbNodeRpcUrl}");
 
         return new ArbitrumRpcModuleWithComparison(
             initializer, blockTree, trigger, txSource, chainSpec, specHelper,
-            logManager, cachedL1PriceData, processingQueue, arbitrumConfig, verifyBlockHashConfig, jsonSerializer, processExitSource);
+            logManager, cachedL1PriceData, processingQueue, arbitrumConfig, verifyBlockHashConfig, jsonSerializer, blocksConfig, processExitSource);
     }
 }

src/Nethermind.Arbitrum/Config/ArbitrumBlockProducerEnvFactory.cs

@@ -1,5 +1,4 @@
 using Autofac;
-using Nethermind.Arbitrum.Execution;
 using Nethermind.Consensus.Processing;
 using Nethermind.Consensus.Producers;
 using Nethermind.Core;
@@ -23,3 +22,19 @@ protected override ContainerBuilder ConfigureBuilder(ContainerBuilder builder)
             .AddScoped<IBlockProcessor.IBlockTransactionsExecutor, ArbitrumBlockProductionTransactionsExecutor>();
     }
 }
+
+public class ArbitrumGlobalWorldStateBlockProducerEnvFactory : GlobalWorldStateBlockProducerEnvFactory
+{
+    public ArbitrumGlobalWorldStateBlockProducerEnvFactory(
+        ILifetimeScope rootLifetime,
+        IWorldStateManager worldStateManager,
+        IBlockProducerTxSourceFactory txSourceFactory) : base(rootLifetime, worldStateManager, txSourceFactory)
+    {
+    }
+
+    protected override ContainerBuilder ConfigureBuilder(ContainerBuilder builder)
+    {
+        return base.ConfigureBuilder(builder)
+            .AddScoped<IBlockProcessor.IBlockTransactionsExecutor, ArbitrumBlockProductionTransactionsExecutor>();
+    }
+}

src/Nethermind.Arbitrum/Execution/ArbitrumBlockProcessor.cs

@@ -196,7 +196,7 @@ public virtual TxReceipt[] ProcessTransactions(Block block, ProcessingOptions pr
 
                         //only pickup scheduled transactions when producing block - otherwise already included in block
                         IEnumerable<Transaction> scheduledTransactions = [];
-                        if (processingOptions.ContainsFlag(ProcessingOptions.ProducingBlock))
+                        if (blockToProduce is not null)
                         {
                             scheduledTransactions = receiptsTracer.TxReceipts.Count > 0
                                 ? GetScheduledTransactions(arbosState, receiptsTracer.LastReceipt, block.Header, specProvider.ChainId)
@@ -333,7 +333,7 @@ private TxAction ProcessTransaction(
                 }
                 else
                 {
-                    if (processingOptions.ContainsFlag(ProcessingOptions.DoNotVerifyNonce) && currentTx.SenderAddress != Address.SystemUser)
+                    if (processingOptions.ContainsFlag(ProcessingOptions.LoadNonceFromState) && currentTx.SenderAddress != Address.SystemUser)
                     {
                         currentTx.Nonce = stateProvider.GetNonce(currentTx.SenderAddress!);
                     }

src/Nethermind.Arbitrum/Execution/ArbitrumBlockProducer.cs

@@ -6,6 +6,7 @@
 using Nethermind.Arbitrum.Execution.Transactions;
 using Nethermind.Arbitrum.Precompiles.Abi;
 using Nethermind.Blockchain;
+using Nethermind.Blockchain.Tracing;
 using Nethermind.Config;
 using Nethermind.Consensus;
 using Nethermind.Consensus.Processing;
@@ -16,6 +17,7 @@
 using Nethermind.Core.Specs;
 using Nethermind.Crypto;
 using Nethermind.Evm.State;
+using Nethermind.Evm.Tracing;
 using Nethermind.Logging;
 using Nethermind.Merge.Plugin.BlockProduction;
 
@@ -60,12 +62,12 @@
             if (timestamp < parent.Timestamp)
                 timestamp = parent.Timestamp;
 
             Address blockAuthor = payloadAttributes?.MessageWithMetadata.Message.Header.Sender;
 
             BlockHeader header = new(
                 parent.Hash!,
                 Keccak.OfAnEmptySequenceRlp,
                 blockAuthor,
                 1,
                 newBlockNumber,
                 parent.GasLimit,