Merge branch 'unstable' into vc-fallback

.github/workflows/test-suite.yml

@@ -225,8 +225,8 @@ jobs:
       run: docker build --build-arg FEATURES=portable -t lighthouse:local .
     - name: Test the built image
       run: docker run -t lighthouse:local lighthouse --version
-  eth1-simulator-ubuntu:
-    name: eth1-simulator-ubuntu
+  basic-simulator-ubuntu:
+    name: basic-simulator-ubuntu
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -235,14 +235,10 @@ jobs:
       with:
           channel: stable
           cache-target: release
-    - name: Install Foundry (anvil)
-      uses: foundry-rs/foundry-toolchain@v1
-      with:
-        version: nightly-ca67d15f4abd46394b324c50e21e66f306a1162d
-    - name: Run the beacon chain sim that starts from an eth1 contract
-      run: cargo run --release --bin simulator eth1-sim
-  merge-transition-ubuntu:
-    name: merge-transition-ubuntu
+    - name: Run a basic beacon chain sim that starts from Bellatrix
+      run: cargo run --release --bin simulator basic-sim
+  fallback-simulator-ubuntu:
+    name: fallback-simulator-ubuntu
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -251,6 +247,7 @@ jobs:
       with:
           channel: stable
           cache-target: release
+<<<<<<< HEAD
     - name: Install Foundry (anvil)
       uses: foundry-rs/foundry-toolchain@v1
       with:
@@ -301,6 +298,10 @@ jobs:
         version: nightly-ca67d15f4abd46394b324c50e21e66f306a1162d
     - name: Run the syncing simulator
       run: cargo run --release --bin simulator syncing-sim
+=======
+    - name: Run a beacon chain sim which tests VC fallback behaviour
+      run: cargo run --release --bin simulator fallback-sim
+>>>>>>> unstable
   doppelganger-protection-test:
     name: doppelganger-protection-test
     runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "small"]') || 'ubuntu-latest'  }}
@@ -458,10 +459,8 @@ jobs:
       'state-transition-vectors-ubuntu',
       'ef-tests-ubuntu',
       'dockerfile-ubuntu',
-      'eth1-simulator-ubuntu',
-      'merge-transition-ubuntu',
-      'no-eth1-simulator-ubuntu',
-      'syncing-simulator-ubuntu',
+      'basic-simulator-ubuntu',
+      'fallback-simulator-ubuntu',
       'doppelganger-protection-test',
       'execution-engine-integration-ubuntu',
       'check-code',