Eip 4788/beacon parent block root in evm

src/Nethermind/Nethermind.AccountAbstraction.Test/AccountAbstractionRpcModuleTests.TestAccountAbstractionRpcBlockchain.cs

@@ -38,6 +38,7 @@
 using Nethermind.State;
 using NSubstitute;
 using Nethermind.Config;
+using Nethermind.Consensus.BeaconBlockRoot;
 
 namespace Nethermind.AccountAbstraction.Test
 {
@@ -252,7 +253,7 @@ protected override BlockProcessor CreateBlockProcessor()
             }
 
             protected override async Task<TestBlockchain> Build(ISpecProvider? specProvider = null,
-                UInt256? initialValues = null)
+                UInt256? initialValues = null, bool addBlockOnStart = true)
             {
                 TestBlockchain chain = await base.Build(specProvider, initialValues);
                 IList<Address> entryPointContractAddresses = new List<Address>();

src/Nethermind/Nethermind.AuRa.Test/AuraBlockProcessorTests.cs

@@ -8,6 +8,7 @@
 using Nethermind.Blockchain.Receipts;
 using Nethermind.Blockchain.Test.Validators;
 using Nethermind.Consensus.AuRa;
+using Nethermind.Consensus.BeaconBlockRoot;
 using Nethermind.Consensus.Processing;
 using Nethermind.Consensus.Rewards;
 using Nethermind.Consensus.Transactions;
@@ -161,6 +162,7 @@ void Process(AuRaBlockProcessor auRaBlockProcessor, int blockNumber, Keccak stat
                 LimboLogs.Instance,
                 Substitute.For<IBlockTree>(),
                 new WithdrawalProcessor(stateProvider, LimboLogs.Instance),
+                new BeaconBlockRootHandler(),
                 txFilter,
                 contractRewriter: contractRewriter);
 

src/Nethermind/Nethermind.AuRa.Test/Contract/AuRaContractGasLimitOverrideTests.cs

@@ -8,6 +8,7 @@
 using Nethermind.Abi;
 using Nethermind.Consensus;
 using Nethermind.Consensus.AuRa;
+using Nethermind.Consensus.AuRa.BeaconBlockRoot;
 using Nethermind.Consensus.AuRa.Contracts;
 using Nethermind.Consensus.AuRa.Withdrawals;
 using Nethermind.Consensus.Processing;
@@ -100,6 +101,7 @@ protected override BlockProcessor CreateBlockProcessor()
                 LimboLogs.Instance,
                 BlockTree,
                 NullWithdrawalProcessor.Instance,
+                NullBeaconBlockRootHandler.Instance,
                 null,
                 GasLimitCalculator as AuRaContractGasLimitOverride);
         }

src/Nethermind/Nethermind.AuRa.Test/Contract/TxPriorityContractTests.cs

@@ -363,7 +363,7 @@ protected override ILocalDataSource<IEnumerable<Address>> GetWhitelistLocalDataS
             protected override ILocalDataSource<IEnumerable<TxPriorityContract.Destination>> GetMinGasPricesLocalDataStore() =>
                 LocalDataSource.GetMinGasPricesLocalDataSource();
 
-            protected override Task<TestBlockchain> Build(ISpecProvider specProvider = null, UInt256? initialValues = null)
+            protected override Task<TestBlockchain> Build(ISpecProvider specProvider = null, UInt256? initialValues = null, bool addBlockOnStart = true)
             {
                 TempFile = TempPath.GetTempFile();
                 LocalDataSource = new TxPriorityContract.LocalDataSource(TempFile.Path, new EthereumJsonSerializer(), new FileSystem(), LimboLogs.Instance, Interval);

src/Nethermind/Nethermind.AuRa.Test/Transactions/TxCertifierFilterTests.cs

@@ -7,6 +7,7 @@
 using Nethermind.Abi;
 using Nethermind.AuRa.Test.Contract;
 using Nethermind.Consensus.AuRa;
+using Nethermind.Consensus.AuRa.BeaconBlockRoot;
 using Nethermind.Consensus.AuRa.Contracts;
 using Nethermind.Consensus.AuRa.Transactions;
 using Nethermind.Consensus.AuRa.Withdrawals;
@@ -156,7 +157,8 @@ protected override BlockProcessor CreateBlockProcessor()
                 ReceiptStorage,
                 LimboLogs.Instance,
                 BlockTree,
-                NullWithdrawalProcessor.Instance);
+                NullWithdrawalProcessor.Instance,
+                NullBeaconBlockRootHandler.Instance);
         }
 
         protected override Task AddBlocksOnStart() => Task.CompletedTask;

src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs

@@ -30,6 +30,7 @@
 using Nethermind.TxPool;
 using NSubstitute;
 using NUnit.Framework;
+using Nethermind.Consensus.AuRa.BeaconBlockRoot;
 
 namespace Nethermind.AuRa.Test.Transactions;
 
@@ -298,6 +299,7 @@ protected override BlockProcessor CreateBlockProcessor()
                 LimboLogs.Instance,
                 BlockTree,
                 NullWithdrawalProcessor.Instance,
+                NullBeaconBlockRootHandler.Instance,
                 PermissionBasedTxFilter);
         }
 

src/Nethermind/Nethermind.Blockchain.Test/BlockProcessorTests.cs

@@ -29,6 +29,7 @@
 using Nethermind.Consensus.Withdrawals;
 using Nethermind.Core.Test.Blockchain;
 using Nethermind.Evm.TransactionProcessing;
+using Nethermind.Consensus.BeaconBlockRoot;
 
 namespace Nethermind.Blockchain.Test
 {

src/Nethermind/Nethermind.Blockchain.Test/FullPruning/FullPruningDiskTest.cs

@@ -48,7 +48,7 @@ public PruningTestBlockchain()
                 TempDirectory = TempPath.GetTempDirectory();
             }
 
-            protected override async Task<TestBlockchain> Build(ISpecProvider? specProvider = null, UInt256? initialValues = null)
+            protected override async Task<TestBlockchain> Build(ISpecProvider? specProvider = null, UInt256? initialValues = null, bool addBlockOnStart = true)
             {
                 TestBlockchain chain = await base.Build(specProvider, initialValues);
                 PruningDb = (IFullPruningDb)DbProvider.StateDb;

src/Nethermind/Nethermind.Blockchain.Test/Producers/DevBlockproducerTests.cs

@@ -5,6 +5,7 @@
 using FluentAssertions;
 using Nethermind.Blockchain.Receipts;
 using Nethermind.Config;
+using Nethermind.Consensus.BeaconBlockRoot;
 using Nethermind.Consensus.Processing;
 using Nethermind.Consensus.Producers;
 using Nethermind.Consensus.Rewards;

src/Nethermind/Nethermind.Blockchain.Test/ReorgTests.cs

@@ -7,6 +7,7 @@
 using Nethermind.Blockchain.Receipts;
 using Nethermind.Blockchain.Spec;
 using Nethermind.Blockchain.Synchronization;
+using Nethermind.Consensus.BeaconBlockRoot;
 using Nethermind.Consensus.Comparers;
 using Nethermind.Consensus.Processing;
 using Nethermind.Consensus.Rewards;

src/Nethermind/Nethermind.Blockchain/BeaconBlockRoot/BeaconBlockRootHandler.cs

@@ -0,0 +1,38 @@
+// SPDX-FileCopyrightText: 2023 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Nethermind.Core.Specs;
+using Nethermind.Core;
+using Nethermind.Evm.Precompiles.Stateful;
+using Nethermind.Int256;
+using Nethermind.State;
+using static Nethermind.Evm.Precompiles.Stateful.BeaconBlockRootPrecompile;
+
+
+namespace Nethermind.Consensus.BeaconBlockRoot;
+public class BeaconBlockRootHandler : IBeaconBlockRootHandler
+{
+    public void HandleBeaconBlockRoot(Block block, IReleaseSpec spec, IWorldState stateProvider)
+    {
+        if (!spec.IsBeaconBlockRootAvailable) return;
+
+        var timestamp = (UInt256)block.Timestamp;
+        var parentBeaconBlockRoot = block.ParentBeaconBlockRoot;
+
+        stateProvider.CreateAccountIfNotExists(BeaconBlockRootPrecompile.Address, 1);
+
+        UInt256.Mod(timestamp, HISTORICAL_ROOTS_LENGTH, out UInt256 timestampReduced);
+        UInt256 rootIndex = timestampReduced + HISTORICAL_ROOTS_LENGTH;
+
+        StorageCell tsStorageCell = new(BeaconBlockRootPrecompile.Address, timestampReduced);
+        StorageCell brStorageCell = new(BeaconBlockRootPrecompile.Address, rootIndex);
+
+        stateProvider.Set(tsStorageCell, timestamp.ToBigEndian());
+        stateProvider.Set(brStorageCell, parentBeaconBlockRoot.Bytes.ToArray());
+    }
+}

src/Nethermind/Nethermind.Blockchain/BeaconBlockRoot/IBeaconBlockRootHandler.cs

@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: 2023 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Nethermind.Core.Specs;
+using Nethermind.Core;
+using Nethermind.State;
+
+namespace Nethermind.Consensus.BeaconBlockRoot;
+public interface IBeaconBlockRootHandler
+{
+    void HandleBeaconBlockRoot(Block block, IReleaseSpec spec, IWorldState state);
+}

src/Nethermind/Nethermind.Blockchain/GenesisLoader.cs

@@ -15,6 +15,7 @@
 using Nethermind.Evm.TransactionProcessing;
 using Nethermind.Specs.ChainSpecStyle;
 using Nethermind.State;
+using Nethermind.Consensus.BeaconBlockRoot;
 
 namespace Nethermind.Blockchain
 {
@@ -24,6 +25,7 @@ public class GenesisLoader
         private readonly ISpecProvider _specProvider;
         private readonly IWorldState _stateProvider;
         private readonly ITransactionProcessor _transactionProcessor;
+        private readonly BeaconBlockRootHandler _beaconBlockRootHandler;
 
         public GenesisLoader(
             ChainSpec chainSpec,
@@ -35,6 +37,7 @@ public GenesisLoader(
             _specProvider = specProvider ?? throw new ArgumentNullException(nameof(specProvider));
             _stateProvider = stateProvider ?? throw new ArgumentNullException(nameof(stateProvider));
             _transactionProcessor = transactionProcessor ?? throw new ArgumentNullException(nameof(transactionProcessor));
+            _beaconBlockRootHandler = new BeaconBlockRootHandler();
         }
 
         public Block Load()
@@ -45,6 +48,8 @@ public Block Load()
             // we no longer need the allocations - 0.5MB RAM, 9000 objects for mainnet
             _chainSpec.Allocations = null;
 
+            _beaconBlockRootHandler?.HandleBeaconBlockRoot(genesis, _specProvider.GenesisSpec, _stateProvider);
+
             _stateProvider.Commit(_specProvider.GenesisSpec, true);
 
             _stateProvider.CommitTree(0);

src/Nethermind/Nethermind.Clique.Test/CliqueBlockProducerTests.cs

@@ -37,6 +37,7 @@
 using Nethermind.TxPool;
 using NUnit.Framework;
 using Nethermind.Config;
+using Nethermind.Consensus.BeaconBlockRoot;
 
 namespace Nethermind.Clique.Test
 {

src/Nethermind/Nethermind.Consensus.AuRa/AuRaBlockProcessor.cs

@@ -6,6 +6,7 @@
 using Nethermind.Blockchain.Find;
 using Nethermind.Blockchain.Receipts;
 using Nethermind.Consensus.AuRa.Validators;
+using Nethermind.Consensus.BeaconBlockRoot;
 using Nethermind.Consensus.Processing;
 using Nethermind.Consensus.Rewards;
 using Nethermind.Consensus.Transactions;
@@ -43,6 +44,7 @@ public AuRaBlockProcessor(
             ILogManager logManager,
             IBlockTree blockTree,
             IWithdrawalProcessor withdrawalProcessor,
+            IBeaconBlockRootHandler beaconBlockRootHandler,
             ITxFilter? txFilter = null,
             AuRaContractGasLimitOverride? gasLimitOverride = null,
             ContractRewriter? contractRewriter = null)
@@ -55,7 +57,8 @@ public AuRaBlockProcessor(
                 receiptStorage,
                 NullWitnessCollector.Instance,
                 logManager,
-                withdrawalProcessor)
+                withdrawalProcessor,
+                beaconBlockRootHandler)
         {
             _specProvider = specProvider;
             _blockTree = blockTree ?? throw new ArgumentNullException(nameof(blockTree));

src/Nethermind/Nethermind.Consensus.AuRa/BeaconBlockRoot/NullBeaconBlockRootHandler.cs

@@ -0,0 +1,22 @@
+// SPDX-FileCopyrightText: 2023 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Nethermind.Consensus.BeaconBlockRoot;
+using Nethermind.Core;
+using Nethermind.Core.Specs;
+using Nethermind.State;
+
+namespace Nethermind.Consensus.AuRa.BeaconBlockRoot;
+internal class NullBeaconBlockRootHandler : IBeaconBlockRootHandler
+{
+    public void HandleBeaconBlockRoot(Block block, IReleaseSpec spec, IWorldState state)
+    {
+    }
+
+    public static IBeaconBlockRootHandler Instance { get; } = new NullBeaconBlockRootHandler();
+}

src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/InitializeBlockchainAuRa.cs

@@ -9,6 +9,7 @@
 using Nethermind.Blockchain.Data;
 using Nethermind.Blockchain.Services;
 using Nethermind.Config;
+using Nethermind.Consensus.AuRa.BeaconBlockRoot;
 using Nethermind.Consensus.AuRa.Config;
 using Nethermind.Consensus.AuRa.Contracts;
 using Nethermind.Consensus.AuRa.Contracts.DataStore;
@@ -97,6 +98,7 @@ protected virtual BlockProcessor NewBlockProcessor(AuRaNethermindApi api, ITxFil
             _api.LogManager,
             _api.BlockTree,
             NullWithdrawalProcessor.Instance,
+            NullBeaconBlockRootHandler.Instance,
             txFilter,
             GetGasLimitCalculator(),
             contractRewriter

src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/StartBlockProducerAuRa.cs

@@ -10,6 +10,7 @@
 using Nethermind.Blockchain;
 using Nethermind.Blockchain.Data;
 using Nethermind.Config;
+using Nethermind.Consensus.AuRa.BeaconBlockRoot;
 using Nethermind.Consensus.AuRa.Config;
 using Nethermind.Consensus.AuRa.Contracts;
 using Nethermind.Consensus.AuRa.Contracts.DataStore;
@@ -159,6 +160,7 @@ private BlockProcessor CreateBlockProcessor(ReadOnlyTxProcessingEnv changeableTx
             _api.LogManager,
             changeableTxProcessingEnv.BlockTree,
             NullWithdrawalProcessor.Instance,
+            NullBeaconBlockRootHandler.Instance,
             auRaTxFilter,
             CreateGasLimitCalculator(constantContractTxProcessingEnv) as AuRaContractGasLimitOverride,
             contractRewriter)

src/Nethermind/Nethermind.Consensus/Processing/BlockProcessor.cs

@@ -7,6 +7,7 @@
 using System.Numerics;
 using Nethermind.Blockchain;
 using Nethermind.Blockchain.Receipts;
+using Nethermind.Consensus.BeaconBlockRoot;
 using Nethermind.Consensus.Rewards;
 using Nethermind.Consensus.Validators;
 using Nethermind.Consensus.Withdrawals;
@@ -15,6 +16,7 @@
 using Nethermind.Core.Specs;
 using Nethermind.Crypto;
 using Nethermind.Evm;
+using Nethermind.Evm.Precompiles.Stateful;
 using Nethermind.Evm.Tracing;
 using Nethermind.Int256;
 using Nethermind.Logging;
@@ -32,6 +34,7 @@ public partial class BlockProcessor : IBlockProcessor
     private readonly IReceiptStorage _receiptStorage;
     private readonly IWitnessCollector _witnessCollector;
     private readonly IWithdrawalProcessor _withdrawalProcessor;
+    private readonly IBeaconBlockRootHandler _beaconBlockRootHandler;
     private readonly IBlockValidator _blockValidator;
     private readonly IRewardCalculator _rewardCalculator;
     private readonly IBlockProcessor.IBlockTransactionsExecutor _blockTransactionsExecutor;
@@ -53,7 +56,8 @@ public BlockProcessor(
         IReceiptStorage? receiptStorage,
         IWitnessCollector? witnessCollector,
         ILogManager? logManager,
-        IWithdrawalProcessor? withdrawalProcessor = null)
+        IWithdrawalProcessor? withdrawalProcessor = null,
+        IBeaconBlockRootHandler beaconBlockRootHandler = null)
     {
         _logger = logManager?.GetClassLogger() ?? throw new ArgumentNullException(nameof(logManager));
         _specProvider = specProvider ?? throw new ArgumentNullException(nameof(specProvider));
@@ -64,7 +68,7 @@ public BlockProcessor(
         _withdrawalProcessor = withdrawalProcessor ?? new WithdrawalProcessor(stateProvider, logManager);
         _rewardCalculator = rewardCalculator ?? throw new ArgumentNullException(nameof(rewardCalculator));
         _blockTransactionsExecutor = blockTransactionsExecutor ?? throw new ArgumentNullException(nameof(blockTransactionsExecutor));
-
+        _beaconBlockRootHandler = beaconBlockRootHandler ?? new BeaconBlockRootHandler();
 
         _receiptsTracer = new BlockReceiptsTracer();
     }
@@ -225,6 +229,8 @@ protected virtual TxReceipt[] ProcessBlock(
         _receiptsTracer.SetOtherTracer(blockTracer);
         _receiptsTracer.StartNewBlockTrace(block);
 
+        _beaconBlockRootHandler.HandleBeaconBlockRoot(block, spec, _stateProvider);
+
         TxReceipt[] receipts = _blockTransactionsExecutor.ProcessTransactions(block, options, _receiptsTracer, spec);
 
         if (spec.IsEip4844Enabled)
@@ -283,6 +289,7 @@ private Block PrepareBlockForProcessing(Block suggestedBlock)
             BaseFeePerGas = bh.BaseFeePerGas,
             WithdrawalsRoot = bh.WithdrawalsRoot,
             IsPostMerge = bh.IsPostMerge,
+            ParentBeaconBlockRoot = bh.ParentBeaconBlockRoot,
         };
 
         return suggestedBlock.CreateCopy(headerForProcessing);

src/Nethermind/Nethermind.Consensus/Processing/ReadOnlyChainProcessingEnv.cs

@@ -3,6 +3,7 @@
 
 using System;
 using Nethermind.Blockchain.Receipts;
+using Nethermind.Consensus.BeaconBlockRoot;
 using Nethermind.Consensus.Rewards;
 using Nethermind.Consensus.Validators;
 using Nethermind.Consensus.Withdrawals;

src/Nethermind/Nethermind.Consensus/Producers/BlockProducerBase.cs

@@ -292,6 +292,7 @@ protected virtual BlockHeader PrepareBlockHeader(BlockHeader parent,
             {
                 Author = blockAuthor,
                 MixHash = payloadAttributes?.PrevRandao,
+                ParentBeaconBlockRoot = payloadAttributes?.BeaconParentBlockRoot
             };
 
             UInt256 difficulty = _difficultyCalculator.Calculate(header, parent);

src/Nethermind/Nethermind.Consensus/Producers/BlockProducerEnvFactory.cs

@@ -4,6 +4,7 @@
 using Nethermind.Blockchain;
 using Nethermind.Blockchain.Receipts;
 using Nethermind.Config;
+using Nethermind.Consensus.BeaconBlockRoot;
 using Nethermind.Consensus.Comparers;
 using Nethermind.Consensus.Processing;
 using Nethermind.Consensus.Rewards;