Merge branch 'master' into 7591_abi_encoding_optimization

NethermindEth · Oct 21, 2024 · f598838 · f598838
2 parents d5244e1 + 70a4780
commit f598838
Show file tree

Hide file tree

Showing 38 changed files with 394 additions and 384 deletions.
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -0,0 +1,46 @@
+name: Trivy scanner
+
+on:
+  pull_request:
+    branches: [master]
+  push:
+    branches: [master]
+  schedule:
+    - cron: '29 19 * * 4'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      security-events: write
+      actions: read
+    env:
+      IMAGE_TAG: nethermind:${{ github.sha }}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
+
+      - name: Build Docker image
+        run: docker build -t $IMAGE_TAG .
+
+      - name: Scan
+        uses: aquasecurity/trivy-action@915b19bbe73b92a6cf82a1bc12b087c9a19a5fe2 #v0.28.0
+        with:
+          image-ref: ${{ env.IMAGE_TAG }}
+          format: template
+          template: '@/contrib/sarif.tpl'
+          output: trivy-results.sarif
+          severity: CRITICAL,HIGH
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
+
+      - name: Upload scan results
+        uses: github/codeql-action/upload-sarif@cf5b0a9041d3c1d336516f1944c96d96598193cc #v2.19.1
+        with:
+          sarif_file: trivy-results.sarif
diff --git a/src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs b/src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs
@@ -171,7 +171,7 @@ protected async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch?
             stateProvider,
             receiptStorage,
             transactionProcessor,
-            new BeaconBlockRootHandler(transactionProcessor),
+            new BeaconBlockRootHandler(transactionProcessor, stateProvider),
             new BlockhashStore(specProvider, stateProvider),
             _logManager);
 

diff --git a/src/Nethermind/Nethermind.AuRa.Test/AuraBlockProcessorTests.cs b/src/Nethermind/Nethermind.AuRa.Test/AuraBlockProcessorTests.cs
@@ -158,7 +158,7 @@ void Process(AuRaBlockProcessor auRaBlockProcessor, int blockNumber, Hash256 sta
                 new BlockProcessor.BlockValidationTransactionsExecutor(transactionProcessor, stateProvider),
                 stateProvider,
                 NullReceiptStorage.Instance,
-                new BeaconBlockRootHandler(transactionProcessor),
+                new BeaconBlockRootHandler(transactionProcessor, stateProvider),
                 LimboLogs.Instance,
                 Substitute.For<IBlockTree>(),
                 new WithdrawalProcessor(stateProvider, LimboLogs.Instance),

diff --git a/src/Nethermind/Nethermind.AuRa.Test/Contract/AuRaContractGasLimitOverrideTests.cs b/src/Nethermind/Nethermind.AuRa.Test/Contract/AuRaContractGasLimitOverrideTests.cs
@@ -97,7 +97,7 @@ protected override BlockProcessor CreateBlockProcessor()
                 new BlockProcessor.BlockValidationTransactionsExecutor(TxProcessor, State),
                 State,
                 ReceiptStorage,
-                new BeaconBlockRootHandler(TxProcessor),
+                new BeaconBlockRootHandler(TxProcessor, State),
                 LimboLogs.Instance,
                 BlockTree,
                 NullWithdrawalProcessor.Instance,

diff --git a/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxCertifierFilterTests.cs b/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxCertifierFilterTests.cs
@@ -154,7 +154,7 @@ protected override BlockProcessor CreateBlockProcessor()
                 new BlockProcessor.BlockValidationTransactionsExecutor(TxProcessor, State),
                 State,
                 ReceiptStorage,
-                new BeaconBlockRootHandler(TxProcessor),
+                new BeaconBlockRootHandler(TxProcessor, State),
                 LimboLogs.Instance,
                 BlockTree,
                 NullWithdrawalProcessor.Instance,

diff --git a/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs b/src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs
@@ -296,7 +296,7 @@ protected override BlockProcessor CreateBlockProcessor()
                 new BlockProcessor.BlockValidationTransactionsExecutor(TxProcessor, State),
                 State,
                 ReceiptStorage,
-                new BeaconBlockRootHandler(TxProcessor),
+                new BeaconBlockRootHandler(TxProcessor, State),
                 LimboLogs.Instance,
                 BlockTree,
                 NullWithdrawalProcessor.Instance,

diff --git a/src/Nethermind/Nethermind.Blockchain.Test/BeaconBlockRootHandlerTests.cs b/src/Nethermind/Nethermind.Blockchain.Test/BeaconBlockRootHandlerTests.cs
@@ -0,0 +1,156 @@
+// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using Nethermind.Blockchain.BeaconBlockRoot;
+using Nethermind.Core;
+using Nethermind.Core.Crypto;
+using Nethermind.Core.Eip2930;
+using Nethermind.Core.Test.Builders;
+using Nethermind.Crypto;
+using Nethermind.Evm;
+using Nethermind.Evm.Tracing;
+using Nethermind.Evm.TransactionProcessing;
+using Nethermind.Int256;
+using Nethermind.Specs.Forks;
+using Nethermind.State;
+using NSubstitute;
+using NUnit.Framework;
+
+namespace Nethermind.Blockchain.Test;
+
+public class BeaconBlockRootHandlerTests
+{
+    private BeaconBlockRootHandler _beaconBlockRootHandler;
+    private ITransactionProcessor _transactionProcessor;
+    private IWorldState _worldState;
+
+    [SetUp]
+    public void Setup()
+    {
+        _worldState = Substitute.For<IWorldState>();
+        _transactionProcessor = Substitute.For<ITransactionProcessor>();
+        _beaconBlockRootHandler = new BeaconBlockRootHandler(_transactionProcessor, _worldState);
+    }
+
+    [Test]
+    public void Test_BeaconRootsAccessList_IsBeaconBlockRootAvailableFalse()
+    {
+        BlockHeader header = Build.A.BlockHeader.WithNumber(1).WithParentBeaconBlockRoot(Hash256.Zero).TestObject;
+        Block block = Build.A.Block.WithHeader(header).TestObject;
+        _worldState.AccountExists(Arg.Any<Address>()).Returns(true);
+
+        (Address? toAddress, AccessList? accessList) result = _beaconBlockRootHandler
+            .BeaconRootsAccessList(block, Shanghai.Instance);
+
+        Assert.That(result.accessList, Is.Null);
+        Assert.That(result.toAddress, Is.Null);
+    }
+
+    [Test]
+    public void Test_BeaconRootsAccessList_HeaderIsGenesis()
+    {
+        BlockHeader header = Build.A.BlockHeader.WithParentBeaconBlockRoot(Hash256.Zero).TestObject;
+        Block block = Build.A.Block.WithHeader(header).TestObject;
+        _worldState.AccountExists(Arg.Any<Address>()).Returns(true);
+
+        (Address? toAddress, AccessList? accessList) result = _beaconBlockRootHandler
+            .BeaconRootsAccessList(block, Cancun.Instance);
+
+        Assert.That(result.accessList, Is.Null);
+        Assert.That(result.toAddress, Is.Null);
+    }
+
+    [Test]
+    public void Test_BeaconRootsAccessList_ParentBeaconBlockRootIsNull()
+    {
+        BlockHeader header = Build.A.BlockHeader.WithNumber(1).TestObject;
+        Block block = Build.A.Block.WithHeader(header).TestObject;
+        _worldState.AccountExists(Arg.Any<Address>()).Returns(true);
+
+        (Address? toAddress, AccessList? accessList) result = _beaconBlockRootHandler
+            .BeaconRootsAccessList(block, Cancun.Instance);
+
+        Assert.That(result.accessList, Is.Null);
+        Assert.That(result.toAddress, Is.Null);
+    }
+
+    [Test]
+    public void Test_BeaconRootsAccessList_canInsertBeaconRootIsTrue_AccountNotExist()
+    {
+        BlockHeader header = Build.A.BlockHeader.WithNumber(1).WithParentBeaconBlockRoot(Hash256.Zero).TestObject;
+        Block block = Build.A.Block.WithHeader(header).TestObject;
+        _worldState.AccountExists(Arg.Any<Address>()).Returns(false);
+
+        (Address? toAddress, AccessList? accessList) result = _beaconBlockRootHandler
+            .BeaconRootsAccessList(block, Cancun.Instance);
+
+        Assert.That(result.accessList, Is.Null);
+        Assert.That(result.toAddress, Is.Null);
+    }
+
+    [Test]
+    public void Test_BeaconRootsAccessList_canInsertBeaconRootIsTrue_AccountExists()
+    {
+        BlockHeader header = Build.A.BlockHeader.WithNumber(1).WithParentBeaconBlockRoot(Hash256.Zero).TestObject;
+        Block block = Build.A.Block.WithHeader(header).TestObject;
+        _worldState.AccountExists(Arg.Any<Address>()).Returns(true);
+
+        (Address? toAddress, AccessList? accessList) result = _beaconBlockRootHandler
+            .BeaconRootsAccessList(block, Cancun.Instance);
+
+        Assert.That(result.accessList, Is.Not.Null);
+        Assert.That(result.accessList.Count.AddressesCount, Is.EqualTo(1));
+        Assert.That(result.accessList.Count.StorageKeysCount, Is.EqualTo(1));
+    }
+
+    [Test]
+    public void Test_BeaconRootsAccessList_canInsertBeaconRootIsTrue_AccountExists_IncludeStorageCellsIsFalse()
+    {
+        BlockHeader header = Build.A.BlockHeader.WithNumber(1).WithParentBeaconBlockRoot(Hash256.Zero).TestObject;
+        Block block = Build.A.Block.WithHeader(header).TestObject;
+        _worldState.AccountExists(Arg.Any<Address>()).Returns(true);
+
+        (Address? toAddress, AccessList? accessList) result = _beaconBlockRootHandler
+            .BeaconRootsAccessList(block, Cancun.Instance, false);
+
+        Assert.That(result.accessList, Is.Not.Null);
+        Assert.That(result.accessList.Count.AddressesCount, Is.EqualTo(1));
+        Assert.That(result.accessList.Count.StorageKeysCount, Is.EqualTo(0));
+    }
+
+    [Test]
+    public void Test_StoreBeaconRoot_AccessListIsNull()
+    {
+        BlockHeader header = Build.A.BlockHeader.TestObject;
+        Block block = Build.A.Block.WithHeader(header).TestObject;
+
+        _beaconBlockRootHandler.StoreBeaconRoot(block, Cancun.Instance);
+
+        _transactionProcessor.DidNotReceive().Execute(Arg.Any<Transaction>(), Arg.Any<BlockExecutionContext>(), Arg.Any<ITxTracer>());
+    }
+
+    [Test]
+    public void Test_StoreBeaconRoot_AccessListNotNull()
+    {
+        BlockHeader header = Build.A.BlockHeader.WithNumber(1).WithParentBeaconBlockRoot(Hash256.Zero).TestObject;
+        Block block = Build.A.Block.WithHeader(header).TestObject;
+        _worldState.AccountExists(Arg.Any<Address>()).Returns(true);
+
+        _beaconBlockRootHandler.StoreBeaconRoot(block, Cancun.Instance);
+
+        Transaction transaction = new()
+        {
+            Value = UInt256.Zero,
+            Data = header.ParentBeaconBlockRoot!.Bytes.ToArray(),
+            To = Eip4788Constants.BeaconRootsAddress,
+            SenderAddress = Address.SystemUser,
+            GasLimit = 30_000_000L,
+            GasPrice = UInt256.Zero,
+            AccessList = new AccessList.Builder().AddAddress(Eip4788Constants.BeaconRootsAddress).Build()
+        };
+
+        transaction.Hash = transaction.CalculateHash();
+        _transactionProcessor.Received().Execute(Arg.Is<Transaction>(t =>
+            t.Hash == transaction.Hash), header, NullTxTracer.Instance);
+    }
+}
diff --git a/src/Nethermind/Nethermind.Blockchain.Test/BlockProcessorTests.cs b/src/Nethermind/Nethermind.Blockchain.Test/BlockProcessorTests.cs
@@ -50,7 +50,7 @@ public void Prepared_block_contains_author_field()
             stateProvider,
             NullReceiptStorage.Instance,
             transactionProcessor,
-            new BeaconBlockRootHandler(transactionProcessor),
+            new BeaconBlockRootHandler(transactionProcessor, stateProvider),
             Substitute.For<IBlockhashStore>(),
             LimboLogs.Instance);
 
@@ -81,7 +81,7 @@ public void Recovers_state_on_cancel()
             stateProvider,
             NullReceiptStorage.Instance,
             transactionProcessor,
-            new BeaconBlockRootHandler(transactionProcessor),
+            new BeaconBlockRootHandler(transactionProcessor, stateProvider),
             Substitute.For<IBlockhashStore>(),
             LimboLogs.Instance);
 

diff --git a/src/Nethermind/Nethermind.Blockchain.Test/Producers/DevBlockproducerTests.cs b/src/Nethermind/Nethermind.Blockchain.Test/Producers/DevBlockproducerTests.cs
@@ -76,7 +76,7 @@ public void Test()
             stateProvider,
             NullReceiptStorage.Instance,
             txProcessor,
-            new BeaconBlockRootHandler(txProcessor),
+            new BeaconBlockRootHandler(txProcessor, stateProvider),
             new BlockhashStore(specProvider, stateProvider),
             LimboLogs.Instance);
         BlockchainProcessor blockchainProcessor = new(

diff --git a/src/Nethermind/Nethermind.Blockchain.Test/ReorgTests.cs b/src/Nethermind/Nethermind.Blockchain.Test/ReorgTests.cs
@@ -78,7 +78,7 @@ public void Setup()
             stateProvider,
             NullReceiptStorage.Instance,
             transactionProcessor,
-            new BeaconBlockRootHandler(transactionProcessor),
+            new BeaconBlockRootHandler(transactionProcessor, stateProvider),
             new BlockhashStore(MainnetSpecProvider.Instance, stateProvider),
             LimboLogs.Instance);
         _blockchainProcessor = new BlockchainProcessor(

diff --git a/src/Nethermind/Nethermind.Blockchain/BeaconBlockRoot/BeaconBlockRootHandler.cs b/src/Nethermind/Nethermind.Blockchain/BeaconBlockRoot/BeaconBlockRootHandler.cs
@@ -1,17 +1,17 @@
 // SPDX-FileCopyrightText: 2023 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using System;
 using Nethermind.Core;
 using Nethermind.Core.Eip2930;
 using Nethermind.Core.Specs;
 using Nethermind.Crypto;
 using Nethermind.Evm.Tracing;
 using Nethermind.Evm.TransactionProcessing;
 using Nethermind.Int256;
+using Nethermind.State;
 
 namespace Nethermind.Blockchain.BeaconBlockRoot;
-public class BeaconBlockRootHandler(ITransactionProcessor processor) : IBeaconBlockRootHandler
+public class BeaconBlockRootHandler(ITransactionProcessor processor, IWorldState stateProvider) : IBeaconBlockRootHandler
 {
     private const long GasLimit = 30_000_000L;
 
@@ -26,7 +26,7 @@ public class BeaconBlockRootHandler(ITransactionProcessor processor) : IBeaconBl
             spec.Eip4788ContractAddress ?? Eip4788Constants.BeaconRootsAddress :
             null;
 
-        if (eip4788ContractAddress is null)
+        if (eip4788ContractAddress is null || !stateProvider.AccountExists(eip4788ContractAddress))
         {
             return (null, null);
         }

diff --git a/src/Nethermind/Nethermind.Blockchain/BeaconBlockRoot/IBeaconBlockRootHandler.cs b/src/Nethermind/Nethermind.Blockchain/BeaconBlockRoot/IBeaconBlockRootHandler.cs
@@ -4,6 +4,7 @@
 using Nethermind.Core;
 using Nethermind.Core.Eip2930;
 using Nethermind.Core.Specs;
+using Nethermind.State;
 
 namespace Nethermind.Blockchain.BeaconBlockRoot;
 public interface IBeaconBlockRootHandler

diff --git a/src/Nethermind/Nethermind.Clique.Test/CliqueBlockProducerTests.cs b/src/Nethermind/Nethermind.Clique.Test/CliqueBlockProducerTests.cs
@@ -140,7 +140,7 @@ public On CreateNode(PrivateKey privateKey, bool withGenesisAlreadyProcessed = f
                 stateProvider,
                 NullReceiptStorage.Instance,
                 transactionProcessor,
-                new BeaconBlockRootHandler(transactionProcessor),
+                new BeaconBlockRootHandler(transactionProcessor, stateProvider),
                 new BlockhashStore(goerliSpecProvider, stateProvider),
                 nodeLogManager);
 
@@ -161,7 +161,7 @@ public On CreateNode(PrivateKey privateKey, bool withGenesisAlreadyProcessed = f
                 minerStateProvider,
                 NullReceiptStorage.Instance,
                 minerTransactionProcessor,
-                new BeaconBlockRootHandler(minerTransactionProcessor),
+                new BeaconBlockRootHandler(minerTransactionProcessor, minerStateProvider),
                 new BlockhashStore(goerliSpecProvider, minerStateProvider),
                 nodeLogManager);
 

diff --git a/src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/InitializeBlockchainAuRa.cs b/src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/InitializeBlockchainAuRa.cs
@@ -108,7 +108,7 @@ protected virtual AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter, B
             new BlockProcessor.BlockValidationTransactionsExecutor(_api.TransactionProcessor, worldState),
             worldState,
             _api.ReceiptStorage!,
-            new BeaconBlockRootHandler(_api.TransactionProcessor!),
+            new BeaconBlockRootHandler(_api.TransactionProcessor!, worldState),
             _api.LogManager,
             _api.BlockTree!,
             NullWithdrawalProcessor.Instance,

diff --git a/src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/StartBlockProducerAuRa.cs b/src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/StartBlockProducerAuRa.cs
@@ -155,7 +155,7 @@ private BlockProcessor CreateBlockProcessor(IReadOnlyTxProcessingScope changeabl
             _api.BlockProducerEnvFactory.TransactionsExecutorFactory.Create(changeableTxProcessingEnv),
             changeableTxProcessingEnv.WorldState,
             _api.ReceiptStorage,
-            new BeaconBlockRootHandler(changeableTxProcessingEnv.TransactionProcessor),
+            new BeaconBlockRootHandler(changeableTxProcessingEnv.TransactionProcessor, changeableTxProcessingEnv.WorldState),
             _api.LogManager,
             _api.BlockTree,
             NullWithdrawalProcessor.Instance,

diff --git a/src/Nethermind/Nethermind.Consensus.Clique/CliquePlugin.cs b/src/Nethermind/Nethermind.Consensus.Clique/CliquePlugin.cs
@@ -113,7 +113,7 @@ public IBlockProducer InitBlockProducer(ITxSource? additionalTxSource = null)
                 scope.WorldState,
                 NullReceiptStorage.Instance,
                 getFromApi.TransactionProcessor,
-                new BeaconBlockRootHandler(scope.TransactionProcessor),
+                new BeaconBlockRootHandler(scope.TransactionProcessor, scope.WorldState),
                 new BlockhashStore(getFromApi.SpecProvider, scope.WorldState),
                 getFromApi.LogManager,
                 new BlockProductionWithdrawalProcessor(new WithdrawalProcessor(scope.WorldState, getFromApi.LogManager)));

diff --git a/src/Nethermind/Nethermind.Consensus.Ethash/NethDevPlugin.cs b/src/Nethermind/Nethermind.Consensus.Ethash/NethDevPlugin.cs
@@ -83,7 +83,7 @@ public IBlockProducer InitBlockProducer(ITxSource? additionalTxSource = null)
                 scope.WorldState,
                 NullReceiptStorage.Instance,
                 scope.TransactionProcessor,
-                new BeaconBlockRootHandler(scope.TransactionProcessor),
+                new BeaconBlockRootHandler(scope.TransactionProcessor, scope.WorldState),
                 new BlockhashStore(getFromApi.SpecProvider, scope.WorldState),
                 getFromApi.LogManager);
 

diff --git a/src/Nethermind/Nethermind.Consensus/Processing/ReadOnlyChainProcessingEnv.cs b/src/Nethermind/Nethermind.Consensus/Processing/ReadOnlyChainProcessingEnv.cs
@@ -69,7 +69,7 @@ IBlockProcessor.IBlockTransactionsExecutor transactionsExecutor
                 scope.WorldState,
                 receiptStorage,
                 scope.TransactionProcessor,
-                new BeaconBlockRootHandler(scope.TransactionProcessor),
+                new BeaconBlockRootHandler(scope.TransactionProcessor, scope.WorldState),
                 new BlockhashStore(specProvider, scope.WorldState),
                 logManager);
         }

diff --git a/src/Nethermind/Nethermind.Consensus/Producers/BlockProducerEnvFactory.cs b/src/Nethermind/Nethermind.Consensus/Producers/BlockProducerEnvFactory.cs
@@ -155,7 +155,7 @@ protected virtual BlockProcessor CreateBlockProcessor(
                 readOnlyTxProcessingEnv.WorldState,
                 receiptStorage,
                 readOnlyTxProcessingEnv.TransactionProcessor,
-                new BeaconBlockRootHandler(readOnlyTxProcessingEnv.TransactionProcessor),
+                new BeaconBlockRootHandler(readOnlyTxProcessingEnv.TransactionProcessor, readOnlyTxProcessingEnv.WorldState),
                 new BlockhashStore(_specProvider, readOnlyTxProcessingEnv.WorldState),
                 logManager,
                 new BlockProductionWithdrawalProcessor(new WithdrawalProcessor(readOnlyTxProcessingEnv.WorldState, logManager)),