From 73738c702c13b027ea92858ba921a28989c203fd Mon Sep 17 00:00:00 2001
From: tersec <tersec@users.noreply.github.com>
Date: Fri, 19 Apr 2024 02:55:58 +0000
Subject: [PATCH] use consensus spec v1.5.0-alpha.0 test vectors; use Nim
 v2.0.4 specifically for 2.0.x (#6221)

---
 .github/workflows/ci.yml                          | 4 ++--
 beacon_chain/spec/datatypes/base.nim              | 2 +-
 tests/consensus_spec/test_fixture_fork_choice.nim | 2 +-
 vendor/nim-eth2-scenarios                         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6cbd43d88..abccf8ba3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
             cpu: amd64
           - os: windows
             cpu: amd64
-        branch: [~, upstream/version-1-6, upstream/version-2-0]
+        branch: [~, upstream/version-1-6, v2.0.4]
         exclude:
           - target:
               os: macos
@@ -47,7 +47,7 @@ jobs:
         include:
           - branch: upstream/version-1-6
             branch-short: version-1-6
-          - branch: upstream/version-2-0
+          - branch: v2.0.4
             branch-short: version-2-0
             nimflags-extra: --mm:refc
           - target:
diff --git a/beacon_chain/spec/datatypes/base.nim b/beacon_chain/spec/datatypes/base.nim
index a2147a0b4..e00a2a8cd 100644
--- a/beacon_chain/spec/datatypes/base.nim
+++ b/beacon_chain/spec/datatypes/base.nim
@@ -74,7 +74,7 @@ export
   tables, results, endians2, json_serialization, sszTypes, beacon_time, crypto,
   digest, presets
 
-const SPEC_VERSION* = "1.4.0"
+const SPEC_VERSION* = "1.5.0-alpha.0"
 ## Spec version we're aiming to be compatible with, right now
 
 const
diff --git a/tests/consensus_spec/test_fixture_fork_choice.nim b/tests/consensus_spec/test_fixture_fork_choice.nim
index 1061d1707..05e90faff 100644
--- a/tests/consensus_spec/test_fixture_fork_choice.nim
+++ b/tests/consensus_spec/test_fixture_fork_choice.nim
@@ -393,7 +393,7 @@ template fcSuite(suiteName: static[string], testPathElem: static[string]) =
       let testsPath = presetPath/path/testPathElem
       if kind != pcDir or not os_ops.dirExists(testsPath):
         continue
-      if testsPath.contains("/eip6110/") or testsPath.contains("\\eip6110\\"):
+      if testsPath.contains("/electra/") or testsPath.contains("\\electra\\"):
         continue
       let fork = forkForPathComponent(path).valueOr:
         raiseAssert "Unknown test fork: " & testsPath
diff --git a/vendor/nim-eth2-scenarios b/vendor/nim-eth2-scenarios
index 4bbc43ab5..1c2941273 160000
--- a/vendor/nim-eth2-scenarios
+++ b/vendor/nim-eth2-scenarios
@@ -1 +1 @@
-Subproject commit 4bbc43ab55337788143a06ea7c055462b17b950a
+Subproject commit 1c29412737b0228a20b410fceb7767d9e787eed0