Add System Transactions to mainnet

src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs

@@ -37,6 +37,7 @@
 using Nethermind.Trie.Pruning;
 using Nethermind.TxPool;
 using NUnit.Framework;
+using Nethermind.Blockchain.BeaconBlockRoot;
 
 namespace Ethereum.Test.Base
 {
@@ -155,6 +156,13 @@ protected async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch?
  codeInfoRepository,
  _logManager);
 
+ TransactionProcessor? txProcessor = new(
+ specProvider,
+ stateProvider,
+ virtualMachine,
+ codeInfoRepository,
+ _logManager);
+
  IBlockProcessor blockProcessor = new BlockProcessor(
  specProvider,
  blockValidator,
@@ -170,7 +178,8 @@ protected async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch?
  stateProvider,
  receiptStorage,
  new BlockhashStore(blockTree, specProvider, stateProvider),
- _logManager);
+ _logManager,
+ new BeaconBlockRootHandler(txProcessor, _logManager));
 
  IBlockchainProcessor blockchainProcessor = new BlockchainProcessor(
  blockTree,

src/Nethermind/Ethereum.Test.Base/GeneralTestBase.cs

@@ -172,7 +172,7 @@ private static void InitializeTestState(GeneralStateTest test, WorldState stateP
  }
 
  stateProvider.CreateAccount(accountState.Key, accountState.Value.Balance);
- stateProvider.InsertCode(accountState.Key, accountState.Value.Code, specProvider.GenesisSpec);
+ stateProvider.InsertCode(accountState.Key, accountState.Value.Code, specProvider.GenesisSpec, false);
  stateProvider.SetNonce(accountState.Key, accountState.Value.Nonce);
  }
 

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

@@ -38,6 +38,7 @@
 using Nethermind.State;
 using NSubstitute;
 using Nethermind.Config;
+using Nethermind.Blockchain.BeaconBlockRoot;
 
 namespace Nethermind.AccountAbstraction.Test
 {
@@ -190,7 +191,8 @@ protected override BlockProcessor CreateBlockProcessor()
  State,
  ReceiptStorage,
  new BlockhashStore(BlockTree, SpecProvider, State),
- LogManager);
+ LogManager,
+ new BeaconBlockRootHandler(TxProcessor, LogManager));
 
  AbiParameterConverter.RegisterFactory(new AbiTypeFactory(new AbiTuple<UserOperationAbi>()));
 

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

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using FluentAssertions;
 using Nethermind.Blockchain;
+using Nethermind.Blockchain.BeaconBlockRoot;
 using Nethermind.Blockchain.Receipts;
 using Nethermind.Blockchain.Test.Validators;
 using Nethermind.Consensus.AuRa;
@@ -160,6 +161,7 @@ void Process(AuRaBlockProcessor auRaBlockProcessor, int blockNumber, Hash256 sta
  LimboLogs.Instance,
  Substitute.For<IBlockTree>(),
  new WithdrawalProcessor(stateProvider, LimboLogs.Instance),
+ new BeaconBlockRootHandler(transactionProcessor, LimboLogs.Instance),
  null,
  txFilter,
  contractRewriter: contractRewriter);

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

@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Nethermind.Abi;
+using Nethermind.Blockchain.BeaconBlockRoot;
 using Nethermind.Blockchain;
 using Nethermind.Consensus;
 using Nethermind.Consensus.AuRa;
@@ -101,6 +102,7 @@ protected override BlockProcessor CreateBlockProcessor()
  LimboLogs.Instance,
  BlockTree,
  NullWithdrawalProcessor.Instance,
+ new BeaconBlockRootHandler(TxProcessor, LimboLogs.Instance),
  null,
  null,
  GasLimitCalculator as AuRaContractGasLimitOverride);

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

@@ -6,6 +6,7 @@
 using FluentAssertions;
 using Nethermind.Abi;
 using Nethermind.AuRa.Test.Contract;
+using Nethermind.Blockchain.BeaconBlockRoot;
 using Nethermind.Blockchain;
 using Nethermind.Consensus.AuRa;
 using Nethermind.Consensus.AuRa.Contracts;
@@ -157,8 +158,8 @@ protected override BlockProcessor CreateBlockProcessor()
  LimboLogs.Instance,
  BlockTree,
  NullWithdrawalProcessor.Instance,
- null
- );
+ new BeaconBlockRootHandler(TxProcessor, LimboLogs.Instance),
+ null);
  }
 
  protected override Task AddBlocksOnStart() => Task.CompletedTask;

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

@@ -31,6 +31,7 @@
 using Nethermind.TxPool;
 using NSubstitute;
 using NUnit.Framework;
+using Nethermind.Blockchain.BeaconBlockRoot;
 
 namespace Nethermind.AuRa.Test.Transactions;
 
@@ -298,6 +299,7 @@ protected override BlockProcessor CreateBlockProcessor()
  LimboLogs.Instance,
  BlockTree,
  NullWithdrawalProcessor.Instance,
+ new BeaconBlockRootHandler(TxProcessor, LimboLogs.Instance),
  null,
  PermissionBasedTxFilter);
  }

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

@@ -28,6 +28,7 @@
 using Nethermind.Consensus.Rewards;
 using Nethermind.Core.Test.Blockchain;
 using Nethermind.Evm.TransactionProcessing;
+using Nethermind.Blockchain.BeaconBlockRoot;
 
 namespace Nethermind.Blockchain.Test
 {
@@ -50,7 +51,9 @@ public void Prepared_block_contains_author_field()
  stateProvider,
  NullReceiptStorage.Instance,
  Substitute.For<IBlockhashStore>(),
- LimboLogs.Instance);
+ LimboLogs.Instance,
+ new BeaconBlockRootHandler(transactionProcessor, LimboLogs.Instance));
+
 
  BlockHeader header = Build.A.BlockHeader.WithAuthor(TestItem.AddressD).TestObject;
  Block block = Build.A.Block.WithHeader(header).TestObject;
@@ -79,7 +82,9 @@ public void Recovers_state_on_cancel()
  stateProvider,
  NullReceiptStorage.Instance,
  Substitute.For<IBlockhashStore>(),
- LimboLogs.Instance);
+ LimboLogs.Instance,
+ new BeaconBlockRootHandler(transactionProcessor, LimboLogs.Instance));
+
 
  BlockHeader header = Build.A.BlockHeader.WithNumber(1).WithAuthor(TestItem.AddressD).TestObject;
  Block block = Build.A.Block.WithTransactions(1, MuirGlacier.Instance).WithHeader(header).TestObject;

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

@@ -3,6 +3,7 @@
 
 using System.Threading;
 using FluentAssertions;
+using Nethermind.Blockchain.BeaconBlockRoot;
 using Nethermind.Blockchain.Blocks;
 using Nethermind.Blockchain.Receipts;
 using Nethermind.Config;
@@ -78,7 +79,8 @@ public void Test()
  stateProvider,
  NullReceiptStorage.Instance,
  new BlockhashStore(blockTree, specProvider, stateProvider),
- LimboLogs.Instance);
+ LimboLogs.Instance,
+ new BeaconBlockRootHandler(txProcessor, LimboLogs.Instance));
  BlockchainProcessor blockchainProcessor = new(
  blockTree,
  blockProcessor,

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

@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using FluentAssertions;
+using Nethermind.Blockchain.BeaconBlockRoot;
 using Nethermind.Blockchain.Blocks;
 using Nethermind.Blockchain.Receipts;
 using Nethermind.Consensus.Comparers;
@@ -78,7 +79,8 @@ public void Setup()
  stateProvider,
  NullReceiptStorage.Instance,
  new BlockhashStore(_blockTree, MainnetSpecProvider.Instance, stateProvider),
- LimboLogs.Instance);
+ LimboLogs.Instance,
+ new BeaconBlockRootHandler(transactionProcessor, LimboLogs.Instance));
  _blockchainProcessor = new BlockchainProcessor(
  _blockTree,
  blockProcessor,

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

@@ -1,39 +1,57 @@
 // SPDX-FileCopyrightText: 2023 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using Nethermind.Core.Specs;
+using System;
 using Nethermind.Core;
-using Nethermind.Int256;
-using Nethermind.State;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Extensions;
+using Nethermind.Core.Specs;
+using Nethermind.Crypto;
+using Nethermind.Evm.Tracing;
+using Nethermind.Evm.TransactionProcessing;
+using Nethermind.Int256;
+using Nethermind.Logging;
+using Nethermind.State;
 
-namespace Nethermind.Consensus.BeaconBlockRoot;
-
+namespace Nethermind.Blockchain.BeaconBlockRoot;
 public class BeaconBlockRootHandler : IBeaconBlockRootHandler
 {
- public void ApplyContractStateChanges(Block block, IReleaseSpec spec, IWorldState stateProvider)
+ private readonly ITransactionProcessor _processor;
+ private static Address Default4788Address = new Address("0x000f3df6d732807ef1319fb7b8bb8522d0beac02");
+ private readonly ILogger _logger;
+ private const long GasLimit = 30_000_000L;
+ public BeaconBlockRootHandler(
+ ITransactionProcessor processor,
+ ILogManager logManager)
  {
+ _processor = processor;
+ _logger = logManager.GetClassLogger();
+ }
+ public void ExecuteSystemCall(Block block, IReleaseSpec spec)
+ {
+ BlockHeader? header = block.Header;
  if (!spec.IsBeaconBlockRootAvailable ||
- block.IsGenesis ||
- block.Header.ParentBeaconBlockRoot is null)
- return;
-
- Address eip4788Account = spec.Eip4788ContractAddress ?? Eip4788Constants.BeaconRootsAddress;
-
- if (!stateProvider.AccountExists(eip4788Account))
- return;
-
- UInt256 timestamp = (UInt256)block.Timestamp;
- Hash256 parentBeaconBlockRoot = block.ParentBeaconBlockRoot;
-
- UInt256.Mod(timestamp, Eip4788Constants.HistoryBufferLength, out UInt256 timestampReduced);
- UInt256 rootIndex = timestampReduced + Eip4788Constants.HistoryBufferLength;
-
- StorageCell tsStorageCell = new(eip4788Account, timestampReduced);
- StorageCell brStorageCell = new(eip4788Account, rootIndex);
-
- stateProvider.Set(tsStorageCell, Bytes.WithoutLeadingZeros(timestamp.ToBigEndian()).ToArray());
- stateProvider.Set(brStorageCell, Bytes.WithoutLeadingZeros(parentBeaconBlockRoot.Bytes).ToArray());
+ header.IsGenesis ||
+ header.ParentBeaconBlockRoot is null) return;
+
+ Transaction? transaction = new()
+ {
+ Value = UInt256.Zero,
+ Data = header.ParentBeaconBlockRoot.Bytes.ToArray(),
+ To = spec.Eip4788ContractAddress ?? Default4788Address,
+ SenderAddress = Address.SystemUser,
+ GasLimit = GasLimit,
+ GasPrice = UInt256.Zero,
+ };
+ transaction.Hash = transaction.CalculateHash();
+
+ try
+ {
+ _processor.Execute(transaction, header, NullTxTracer.Instance);
+ }
+ catch (Exception e)
+ {
+ if (_logger.IsError) _logger.Error("Error during calling BeaconBlockRoot contract", e);
+ }
  }
 }

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

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2023 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using Nethermind.Core.Specs;
 using Nethermind.Core;
+using Nethermind.Core.Specs;
 using Nethermind.State;
 
-namespace Nethermind.Consensus.BeaconBlockRoot;
+namespace Nethermind.Blockchain.BeaconBlockRoot;
 public interface IBeaconBlockRootHandler
 {
- void ApplyContractStateChanges(Block block, IReleaseSpec spec, IWorldState state);
+ void ExecuteSystemCall(Block block, IReleaseSpec spec);
 }

src/Nethermind/Nethermind.Blockchain/Contracts/Contract.cs

@@ -201,7 +201,6 @@ protected byte[] CallCore(ITransactionProcessor transactionProcessor, BlockHeade
  return tracer.ReturnValue;
  }
  }
-
  protected object[] DecodeReturnData(string functionName, byte[] data)
  {
  AbiEncodingInfo abiEncodingInfo = AbiDefinition.GetFunction(functionName).GetReturnInfo();

src/Nethermind/Nethermind.Blockchain/GenesisLoader.cs

@@ -14,7 +14,6 @@
 using Nethermind.Evm.TransactionProcessing;
 using Nethermind.Specs.ChainSpecStyle;
 using Nethermind.State;
-using Nethermind.Consensus.BeaconBlockRoot;
 
 namespace Nethermind.Blockchain
 {
@@ -24,7 +23,6 @@ public class GenesisLoader
  private readonly ISpecProvider _specProvider;
  private readonly IWorldState _stateProvider;
  private readonly ITransactionProcessor _transactionProcessor;
- private readonly BeaconBlockRootHandler _beaconBlockRootHandler;
 
  public GenesisLoader(
  ChainSpec chainSpec,
@@ -36,7 +34,6 @@ 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()

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

@@ -37,6 +37,7 @@
 using Nethermind.TxPool;
 using NUnit.Framework;
 using Nethermind.Config;
+using Nethermind.Blockchain.BeaconBlockRoot;
 
 namespace Nethermind.Clique.Test
 {
@@ -141,7 +142,8 @@ public On CreateNode(PrivateKey privateKey, bool withGenesisAlreadyProcessed = f
  stateProvider,
  NullReceiptStorage.Instance,
  new BlockhashStore(blockTree, goerliSpecProvider, stateProvider),
- nodeLogManager);
+ nodeLogManager,
+ new BeaconBlockRootHandler(transactionProcessor, nodeLogManager));
 
  BlockchainProcessor processor = new(blockTree, blockProcessor, new AuthorRecoveryStep(snapshotManager), stateReader, nodeLogManager, BlockchainProcessor.Options.NoReceipts);
  processor.Start();
@@ -159,8 +161,9 @@ public On CreateNode(PrivateKey privateKey, bool withGenesisAlreadyProcessed = f
  new BlockProcessor.BlockProductionTransactionsExecutor(minerTransactionProcessor, minerStateProvider, goerliSpecProvider, _logManager),
  minerStateProvider,
  NullReceiptStorage.Instance,
- new BlockhashStore(blockTree, goerliSpecProvider, minerStateProvider),
- nodeLogManager);
+ new BlockhashStore(blockTree, specProvider, stateProvider),
+ nodeLogManager,
+ new BeaconBlockRootHandler(minerTransactionProcessor, nodeLogManager));
 
  BlockchainProcessor minerProcessor = new(blockTree, minerBlockProcessor, new AuthorRecoveryStep(snapshotManager), stateReader, nodeLogManager, BlockchainProcessor.Options.NoReceipts);
 

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

@@ -3,6 +3,7 @@
 
 using System;
 using Nethermind.Blockchain;
+using Nethermind.Blockchain.BeaconBlockRoot;
 using Nethermind.Blockchain.Blocks;
 using Nethermind.Blockchain.Find;
 using Nethermind.Blockchain.Receipts;
@@ -17,6 +18,7 @@
 using Nethermind.Crypto;
 using Nethermind.Evm;
 using Nethermind.Evm.Tracing;
+using Nethermind.Evm.TransactionProcessing;
 using Nethermind.Logging;
 using Nethermind.State;
 using Nethermind.TxPool;
@@ -42,6 +44,7 @@ public AuRaBlockProcessor(
  ILogManager logManager,
  IBlockFinder blockTree,
  IWithdrawalProcessor withdrawalProcessor,
+ IBeaconBlockRootHandler beaconBlockRootProcessor,
  IAuRaValidator? auRaValidator,
  ITxFilter? txFilter = null,
  AuRaContractGasLimitOverride? gasLimitOverride = null,
@@ -55,6 +58,7 @@ public AuRaBlockProcessor(
  receiptStorage,
  new BlockhashStore(blockTree, specProvider, stateProvider),
  logManager,
+ beaconBlockRootProcessor,
  withdrawalProcessor)
  {
  _specProvider = specProvider;