Merge branch 'master' into locks

Author: kamilchodola

.github/workflows/pr-labeler.yml

@@ -11,9 +11,19 @@ jobs:
     permissions:
       pull-requests: write
     steps:
+      - name: Create GitHub app token
+        id: gh-app
+        uses: actions/create-github-app-token@v3
+        with:
+          app-id: ${{ vars.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      # Labels added with the default GITHUB_TOKEN do not emit workflow-triggering events, so
+      # label-triggered runs (e.g. the reproducible benchmarks) never fired on auto-labeling.
       - name: Apply labels from PR template checkboxes
         uses: actions/github-script@v8
         with:
+          github-token: ${{ steps.gh-app.outputs.token }}
           script: |
             // --- Checkbox rules ---
             const checkboxToLabel = {

.github/workflows/run-expb-reproducible-benchmarks.yml

@@ -26,6 +26,7 @@ on:
         options:
           - realblocks
           - superblocks
+          - fusaka
         default: superblocks
       delay_seconds:
         description: Value used to replace <<DELAY>> placeholder (integer)
@@ -185,7 +186,7 @@ jobs:
             delay_seconds="${DISPATCH_DELAY_SECONDS:-0}"
             if [[ -n "${DISPATCH_AMOUNT}" ]]; then
               amount="${DISPATCH_AMOUNT}"
-            elif [[ "${payload_set}" == "realblocks" ]]; then
+            elif [[ "${payload_set}" == "realblocks" || "${payload_set}" == "fusaka" ]]; then
               amount="1000"
             else
               amount="100"
@@ -217,7 +218,7 @@ jobs:
             branch="${PR_HEAD_BRANCH}"
             state_layout="flat"
             payload_set="superblocks"
-            payload_sets='["superblocks","realblocks"]'
+            payload_sets='["superblocks","realblocks","fusaka"]'
             expb_repo="NethermindEth/execution-payloads-benchmarks"
             expb_branch="main"
             expb_data_dir="/mnt/sda/expb-data"
@@ -232,7 +233,7 @@ jobs:
             branch="${PUSH_BRANCH}"
             state_layout="flat"
             payload_set="superblocks"
-            payload_sets='["superblocks","realblocks"]'
+            payload_sets='["superblocks","realblocks","fusaka"]'
             expb_repo="NethermindEth/execution-payloads-benchmarks"
             expb_branch="main"
             expb_data_dir="/mnt/sda/expb-data"
@@ -311,8 +312,12 @@ jobs:
             config_file="github-action-compressed-mainnet-flat.yaml"
           elif [[ "${state_layout}" == "flat" && "${payload_set}" == "realblocks" ]]; then
             config_file="github-action-mainnet-flat.yaml"
+          elif [[ "${state_layout}" == "flat" && "${payload_set}" == "fusaka" ]]; then
+            config_file="github-action-mainnet-fusaka-flat.yaml"
           elif [[ "${state_layout}" == "halfpath" && "${payload_set}" == "superblocks" ]]; then
             config_file="github-action-compressed-mainnet.yaml"
+          elif [[ "${state_layout}" == "halfpath" && "${payload_set}" == "fusaka" ]]; then
+            config_file="github-action-mainnet-fusaka.yaml"
           else
             config_file="github-action-mainnet.yaml"
           fi
@@ -510,8 +515,12 @@ jobs:
             config_file="github-action-compressed-mainnet-flat.yaml"
           elif [[ "${STATE_LAYOUT}" == "flat" && "${PAYLOAD_SET}" == "realblocks" ]]; then
             config_file="github-action-mainnet-flat.yaml"
+          elif [[ "${STATE_LAYOUT}" == "flat" && "${PAYLOAD_SET}" == "fusaka" ]]; then
+            config_file="github-action-mainnet-fusaka-flat.yaml"
           elif [[ "${STATE_LAYOUT}" == "halfpath" && "${PAYLOAD_SET}" == "superblocks" ]]; then
             config_file="github-action-compressed-mainnet.yaml"
+          elif [[ "${STATE_LAYOUT}" == "halfpath" && "${PAYLOAD_SET}" == "fusaka" ]]; then
+            config_file="github-action-mainnet-fusaka.yaml"
           else
             config_file="github-action-mainnet.yaml"
           fi
@@ -573,7 +582,7 @@ jobs:
         run: |
           set -euo pipefail
           if [[ -z "${AMOUNT}" ]]; then
-            if [[ "${PAYLOAD_SET}" == "realblocks" ]]; then
+            if [[ "${PAYLOAD_SET}" == "realblocks" || "${PAYLOAD_SET}" == "fusaka" ]]; then
               AMOUNT="1000"
             else
               AMOUNT="100"
@@ -1074,13 +1083,24 @@ jobs:
           restore-keys: |
             expb-master-metrics-v3-realblocks-
 
+      - name: Restore master metrics (fusaka)
+        id: restore-master-fusaka
+        continue-on-error: true
+        uses: actions/cache/restore@v4
+        with:
+          path: /tmp/expb-master-metrics-cache-fusaka
+          key: expb-master-metrics-v3-fusaka-${{ github.event.pull_request.base.sha }}
+          restore-keys: |
+            expb-master-metrics-v3-fusaka-
+
       - name: Build PR comparison comment
         id: pr-comment
         shell: bash
         env:
           METRICS_DIR: ${{ runner.temp }}/all-metrics
           MASTER_SUPERBLOCKS: /tmp/expb-master-metrics-cache-superblocks/master-metrics.env
           MASTER_REALBLOCKS: /tmp/expb-master-metrics-cache-realblocks/master-metrics.env
+          MASTER_FUSAKA: /tmp/expb-master-metrics-cache-fusaka/master-metrics.env
           PAYLOAD_SETS: ${{ needs.resolve.outputs.payload_sets }}
           STATE_LAYOUT: ${{ needs.resolve.outputs.state_layout }}
           CLEAN_BRANCH: ${{ needs.resolve.outputs.clean_branch }}
@@ -1216,11 +1236,11 @@ jobs:
             current_metrics="${METRICS_DIR}/expb-single-metrics-${ps}-run1/expb-metrics.env"
 
             # Master metrics from cache
-            if [[ "${ps}" == "superblocks" ]]; then
-              master_metrics="${MASTER_SUPERBLOCKS}"
-            else
-              master_metrics="${MASTER_REALBLOCKS}"
-            fi
+            case "${ps}" in
+              superblocks) master_metrics="${MASTER_SUPERBLOCKS}" ;;
+              fusaka) master_metrics="${MASTER_FUSAKA}" ;;
+              *) master_metrics="${MASTER_REALBLOCKS}" ;;
+            esac
 
             build_table "${ps}" "${current_metrics}" "${master_metrics}"
           done

scripts/superchain.py

@@ -17,7 +17,7 @@
 
 SUPERCHAIN_REPOSITORY = "https://github.com/ethereum-optimism/superchain-registry/archive/refs/heads/main.zip"
 IGNORED_CHAINS = ["arena-z-testnet", "creator-chain-testnet", "rehearsal-0-bn-0", "rehearsal-0-bn-1", "celo", "radius_testnet", "silent-data-mainnet"]
-IGNORED_L1S = ["sepolia-dev-0"]
+IGNORED_L1S = ["sepolia-dev-0", "sepolia-devnet-2"]
 
 
 def keccak(hex):

src/Nethermind/Nethermind.Api.Test/TestPlugin.cs

@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using System.Threading.Tasks;
 using Nethermind.Api.Extensions;
 
 namespace Nethermind.Api.Test
@@ -11,7 +10,6 @@ public class TestPlugin : INethermindPlugin
         public string Name { get; }
         public string Description { get; }
         public string Author { get; }
-        public Task Init(INethermindApi nethermindApi) => throw new System.NotImplementedException();
 
         public bool Enabled => true;
     }

src/Nethermind/Nethermind.Api.Test/TestPlugin2.cs

@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using System.Threading.Tasks;
 using Nethermind.Api.Extensions;
 
 namespace Nethermind.Api.Test
@@ -11,7 +10,6 @@ public class TestPlugin2 : INethermindPlugin
         public string Name { get; }
         public string Description { get; }
         public string Author { get; }
-        public Task Init(INethermindApi nethermindApi) => throw new System.NotImplementedException();
 
         public bool Enabled => true;
     }

src/Nethermind/Nethermind.Api/Extensions/INethermindPlugin.cs

@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using System.Threading.Tasks;
 using Autofac.Core;
 
 namespace Nethermind.Api.Extensions;
@@ -16,8 +15,6 @@ public interface INethermindPlugin
 
     void InitTxTypesAndRlpDecoders(INethermindApi api) { }
 
-    Task Init(INethermindApi nethermindApi) => Task.CompletedTask;
-
     bool MustInitialize => false;
     bool Enabled { get; }
     IModule? Module => null;

src/Nethermind/Nethermind.AuRa.Test/AuRaPluginTests.cs

@@ -1,49 +1,15 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using System;
-using Autofac;
-using Nethermind.Api;
-using Nethermind.Config;
-using Nethermind.Consensus.AuRa;
 using Nethermind.Consensus.AuRa.Config;
-using Nethermind.Consensus.AuRa.InitializationSteps;
 using Nethermind.Core;
-using Nethermind.Core.Specs;
-using Nethermind.Core.Test.Modules;
-using Nethermind.Logging;
-using Nethermind.Serialization.Json;
 using Nethermind.Specs;
-using Nethermind.Specs.ChainSpecStyle;
-using Nethermind.Specs.Test.ChainSpecStyle;
-using NSubstitute;
 using NUnit.Framework;
 
 namespace Nethermind.AuRa.Test
 {
     public class AuRaPluginTests
     {
-        [Test]
-        public void Init_when_not_AuRa_does_not_throw()
-        {
-            ChainSpec chainSpec = new();
-            AuRaPlugin auRaPlugin = new(chainSpec);
-            chainSpec.EngineChainSpecParametersProvider = new TestChainSpecParametersProvider(new AuRaChainSpecEngineParameters());
-            using IContainer testNethermindContainer = new ContainerBuilder().AddModule(new TestNethermindModule()).Build();
-            NethermindApi.Dependencies apiDependencies = new(
-                new ConfigProvider(),
-                new EthereumJsonSerializer(),
-                new TestLogManager(),
-                chainSpec,
-                Substitute.For<ISpecProvider>(),
-                [],
-                Substitute.For<IProcessExitSource>(),
-                testNethermindContainer);
-            AuRaNethermindApi api = new(apiDependencies);
-            Action init = () => auRaPlugin.Init(api);
-            Assert.That(init, Throws.Nothing);
-        }
-
         [Test]
         public void ApplyToReleaseSpec_sets_Eip158IgnoredAccount()
         {