Merge branch 'master' into keccak-cache

.github/workflows/build-solutions.yml

@@ -22,5 +22,14 @@ jobs:
           submodules: ${{ matrix.solution == 'EthereumTests' }}
       - name: Set up .NET
         uses: actions/setup-dotnet@v4
+      - name: Cache dotnet packages
+        id: cache-dotnet
+        uses: actions/cache@v4
+        with:
+          # nuget cache files are stored in `~/.nuget/packages/` on Linux/macOS
+          path: ~/.nuget/packages/
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}
+          restore-keys: |
+            ${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}
       - name: Build ${{ matrix.solution }}.sln
         run: dotnet build src/Nethermind/${{ matrix.solution }}.sln -c ${{ matrix.config }}

.github/workflows/nethermind-tests.yml

@@ -77,6 +77,12 @@ jobs:
       uses: actions/checkout@v4
     - name: Set up .NET
       uses: actions/setup-dotnet@v4
+    - name: Cache dotnet packages
+      id: cache-dotnet
+      uses: actions/cache/restore@v4
+      with:
+        path: ~/.nuget/packages/
+        key: ${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}
     - name: ${{ matrix.project }}
       id: test
       run: |

.github/workflows/update-config-files.yml

@@ -1,8 +1,8 @@
-name: "[UPDATE] Config files (fast sync settings)"
+name: Update fast sync settings
 
 on:
   schedule:
-    - cron: "0 0 * * 0"
+    - cron: '0 0 * * 0'
   workflow_dispatch:
 
 permissions:
@@ -11,58 +11,33 @@ permissions:
 
 jobs:
   update-configs:
-    if: github.repository_owner == 'NethermindEth'
-    name: Update fast sync settings in config files
+    name: Update fast sync settings
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.ref }}
-      - name: Authenticate App
-        id: gh-app
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ vars.APP_ID }}
-          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+        uses: actions/checkout@v4
       - name: Install dependencies
         run: |
           pip3 install setuptools
           pip3 install emoji
       - name: Update config files
-        run: |
-          python3 scripts/syncSettings.py ${{ secrets.ETHERSCAN_API_KEY }}
-      - name: Create pull request
-        uses: peter-evans/create-pull-request@v6.0.2
+        run: python3 scripts/syncSettings.py ${{ secrets.ETHERSCAN_API_KEY }}
+      - name: Create GitHub app token
+        id: gh-app
+        uses: actions/create-github-app-token@v1
         with:
-          token: ${{ steps.gh-app.outputs.token }}
-          commit-message: Updating Fast Sync config files
-          body: |
-            Config files included:
-            - mainnet.cfg
-            - gnosis.cfg
-            - chiado.cfg
-            - sepolia.cfg
-            - energyweb.cfg
-            - volta.cfg
-            - exosama.cfg
-            - joc-mainnet.cfg
-            - joc-testnet.cfg
-
-            Properties refreshed:
-            - PivotNumber
-            - PivotHash
-            - PivotTotalDifficulty
-
-            - Auto-generated by [create-pull-request][1]
-            [1]: https://github.com/peter-evans/create-pull-request
-          title: "Update Fast Sync configuration in Nethermind repository"
-          labels: configs
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          committer: GitHub <noreply@github.com>
-          branch: configs-update
-          branch-suffix: short-commit-hash
-          base: master
-      - name: Check outputs
+          app-id: ${{ vars.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+      - name: Create a pull request
+        env:
+          GH_TOKEN: ${{ steps.gh-app.outputs.token }}
         run: |
-          echo "Pull Request Number - ${{ env.PULL_REQUEST_NUMBER }}"
+          head_branch=feature/fast-sync-config-${{ github.run_number }}-${{ github.run_attempt }}
+          git config user.name "${{ github.actor }}"
+          git config user.email "${{ github.actor }}@users.noreply.github.com"
+          git checkout -b $head_branch
+          git add -A
+          git commit -am "Auto-update fast sync settings"
+          git push origin $head_branch
+          gh pr create -B master -H $head_branch -t "Auto-update fast sync settings" \
+            -b "Updated fast sync settings in the configuration files" -l configuration -l sync

.github/workflows/update-fast-sync.yml

@@ -0,0 +1,43 @@
+name: Update fast sync settings
+
+on:
+  schedule:
+    - cron: '0 0 * * 0'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  update-configs:
+    name: Update fast sync settings
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          pip3 install setuptools
+          pip3 install emoji
+      - name: Update config files
+        run: python3 scripts/syncSettings.py ${{ secrets.ETHERSCAN_API_KEY }}
+      - name: Create GitHub app token
+        id: gh-app
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+      - name: Create a pull request
+        env:
+          GH_TOKEN: ${{ steps.gh-app.outputs.token }}
+        run: |
+          head_branch=feature/fast-sync-config-${{ github.run_number }}-${{ github.run_attempt }}
+          git config user.name "${{ github.actor }}"
+          git config user.email "${{ github.actor }}@users.noreply.github.com"
+          git checkout -b $head_branch
+          git add -A
+          git commit -am "Auto-update fast sync settings"
+          git push origin $head_branch
+          gh pr create -B master -H $head_branch -t "Auto-update fast sync settings" \
+            -b "Updated fast sync settings in config files" -l configuration -l sync

README.md

@@ -22,7 +22,7 @@ Nethermind documentation is available at [docs.nethermind.io](https://docs.nethe
 
 ### Supported networks
 
-**`Mainnet`** **`Goerli`** **`Sepolia`** **`Holesky`** **`Gnosis (xDai)`** **`Chiado`** **`OP Mainnet`** **`OP Sepolia`** **`Base Mainnet`** **`Base Sepolia`** **`Energy Web`** **`Volta`**
+**`Mainnet`** **`Sepolia`** **`Holesky`** **`Gnosis`** **`Chiado`** **`OP Mainnet`** **`OP Sepolia`** **`Base Mainnet`** **`Base Sepolia`** **`Energy Web`** **`Volta`**
 
 ## Download and run
 

scripts/syncSettings.py

@@ -63,6 +63,26 @@
         "url": "https://rpc-1.testnet.japanopenchain.org:8545",
         "blockReduced": 8192,
         "multiplierRequirement": 10000
+    },
+    "base-mainnet": {
+        "url": "https://mainnet.base.org",
+        "blockReduced": 8192,
+        "multiplierRequirement": 10000
+    },
+    "base-sepolia": {
+        "url": "https://sepolia.base.org",
+        "blockReduced": 8192,
+        "multiplierRequirement": 10000
+    },
+    "op-mainnet": {
+        "url": "https://mainnet.optimism.io",
+        "blockReduced": 8192,
+        "multiplierRequirement": 10000
+    },
+    "op-sepolia": {
+        "url": "https://sepolia.optimism.io",
+        "blockReduced": 8192,
+        "multiplierRequirement": 10000
     }
 }
 

src/Nethermind/Directory.Build.props

@@ -14,7 +14,7 @@
     <Copyright>Demerzel Solutions Limited</Copyright>
     <Product>Nethermind</Product>
     <SourceRevisionId Condition="'$(Commit)' != ''">$(Commit)</SourceRevisionId>
-    <VersionPrefix>1.28.0</VersionPrefix>
+    <VersionPrefix>1.29.0</VersionPrefix>
     <VersionSuffix>unstable</VersionSuffix>
   </PropertyGroup>
 

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

@@ -15,25 +15,49 @@ public class BeaconBlockRootHandler(ITransactionProcessor processor) : IBeaconBl
 {
     private const long GasLimit = 30_000_000L;
 
-    public void StoreBeaconRoot(Block block, IReleaseSpec spec)
+    public (Address? toAddress, AccessList? accessList) BeaconRootsAccessList(Block block, IReleaseSpec spec, bool includeStorageCells = true)
     {
         BlockHeader? header = block.Header;
-        var canInsertBeaconRoot = spec.IsBeaconBlockRootAvailable
+        bool canInsertBeaconRoot = spec.IsBeaconBlockRootAvailable
                                   && !header.IsGenesis
                                   && header.ParentBeaconBlockRoot is not null;
 
-        if (canInsertBeaconRoot)
+        Address? eip4788ContractAddress = canInsertBeaconRoot ?
+            spec.Eip4788ContractAddress ?? Eip4788Constants.BeaconRootsAddress :
+            null;
+
+        if (eip4788ContractAddress is null)
+        {
+            return (null, null);
+        }
+
+        var builder = new AccessList.Builder()
+            .AddAddress(eip4788ContractAddress);
+
+        if (includeStorageCells)
+        {
+            builder.AddStorage(block.Timestamp % 8191);
+        }
+
+        return (eip4788ContractAddress, builder.Build());
+    }
+
+    public void StoreBeaconRoot(Block block, IReleaseSpec spec)
+    {
+        (Address? toAddress, AccessList? accessList) = BeaconRootsAccessList(block, spec, includeStorageCells: false);
+
+        if (toAddress is not null)
         {
-            Address beaconRootsAddress = spec.Eip4788ContractAddress ?? Eip4788Constants.BeaconRootsAddress;
+            BlockHeader? header = block.Header;
             Transaction transaction = new()
             {
                 Value = UInt256.Zero,
                 Data = header.ParentBeaconBlockRoot.Bytes.ToArray(),
-                To = beaconRootsAddress,
+                To = toAddress,
                 SenderAddress = Address.SystemUser,
                 GasLimit = GasLimit,
                 GasPrice = UInt256.Zero,
-                AccessList = new AccessList.Builder().AddAddress(beaconRootsAddress).Build()
+                AccessList = accessList
             };
 
             transaction.Hash = transaction.CalculateHash();

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

@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using Nethermind.Core;
+using Nethermind.Core.Eip2930;
 using Nethermind.Core.Specs;
 
 namespace Nethermind.Blockchain.BeaconBlockRoot;
 public interface IBeaconBlockRootHandler
 {
+    (Address? toAddress, AccessList? accessList) BeaconRootsAccessList(Block block, IReleaseSpec spec, bool includeStorageCells = true);
     void StoreBeaconRoot(Block block, IReleaseSpec spec);
 }

src/Nethermind/Nethermind.Blockchain/Blocks/BlockStore.cs

@@ -20,8 +20,8 @@ public class BlockStore : IBlockStore
     private readonly BlockDecoder _blockDecoder = new();
     public const int CacheSize = 128 + 32;
 
-    private readonly LruCache<ValueHash256, Block>
-        _blockCache = new(CacheSize, CacheSize, "blocks");
+    private readonly ClockCache<ValueHash256, Block>
+        _blockCache = new(CacheSize);
     private readonly long? _maxSize;
 
     public BlockStore(IDb blockDb, long? maxSize = null)

src/Nethermind/Nethermind.Blockchain/Headers/HeaderStore.cs

@@ -21,8 +21,8 @@ public class HeaderStore : IHeaderStore
     private readonly IDb _headerDb;
     private readonly IDb _blockNumberDb;
     private readonly HeaderDecoder _headerDecoder = new();
-    private readonly LruCache<ValueHash256, BlockHeader> _headerCache =
-        new(CacheSize, CacheSize, "headers");
+    private readonly ClockCache<ValueHash256, BlockHeader> _headerCache =
+        new(CacheSize);
 
     public HeaderStore(IDb headerDb, IDb blockNumberDb)
     {

src/Nethermind/Nethermind.Blockchain/Receipts/PersistentReceiptStorage.cs

@@ -321,7 +321,7 @@ public long MigratedBlockNumber
             set
             {
                 _migratedBlockNumber = value;
-                _defaultColumn.Set(MigrationBlockNumberKey, MigratedBlockNumber.ToBigEndianByteArrayWithoutLeadingZeros());
+                _defaultColumn.PutSpan(MigrationBlockNumberKey.Bytes, value.ToBigEndianSpanWithoutLeadingZeros(out _));
             }
         }
 

src/Nethermind/Nethermind.Config/BlocksConfig.cs

@@ -26,7 +26,9 @@ public class BlocksConfig : IBlocksConfig
 
         public bool PreWarmStateOnBlockProcessing { get; set; } = true;
 
-        public int BlockProductionTimeoutMs { get; set; } = 4000;
+        public int BlockProductionTimeoutMs { get; set; } = 4_000;
+
+        public int GenesisTimeoutMs { get; set; } = 40_000;
 
         public string ExtraData
         {

src/Nethermind/Nethermind.Config/IBlocksConfig.cs

@@ -40,5 +40,8 @@ public interface IBlocksConfig : IConfig
     [ConfigItem(Description = "Block Production timeout, in milliseconds.", DefaultValue = "4000")]
     int BlockProductionTimeoutMs { get; set; }
 
+    [ConfigItem(Description = "Genesis block load timeout, in milliseconds.", DefaultValue = "40000")]
+    int GenesisTimeoutMs { get; set; }
+
     byte[] GetExtraDataBytes();
 }

src/Nethermind/Nethermind.Consensus.AuRa/Validators/ValidatorStore.cs

@@ -36,7 +36,7 @@ public void SetValidators(long finalizingBlockNumber, Address[] validators)
                 var validatorInfo = new ValidatorInfo(finalizingBlockNumber, _latestFinalizedValidatorsBlockNumber, validators);
                 var rlp = Rlp.Encode(validatorInfo);
                 _db.Set(GetKey(finalizingBlockNumber), rlp.Bytes);
-                _db.Set(LatestFinalizedValidatorsBlockNumberKey, finalizingBlockNumber.ToBigEndianByteArrayWithoutLeadingZeros());
+                _db.PutSpan(LatestFinalizedValidatorsBlockNumberKey.Bytes, finalizingBlockNumber.ToBigEndianSpanWithoutLeadingZeros(out _));
                 _latestFinalizedValidatorsBlockNumber = finalizingBlockNumber;
                 _latestValidatorInfo = validatorInfo;
                 Metrics.ValidatorsCount = validators.Length;