From ce591f98c85695a4a3ae3129219937ceaafefe98 Mon Sep 17 00:00:00 2001
From: Hsiao-Wei Wang <hsiaowei.eth@gmail.com>
Date: Mon, 1 Apr 2024 10:43:38 +0900
Subject: [PATCH] Enable EIP7549 CI

---
 .circleci/config.yml                    | 16 ++++++++++++++++
 .github/workflows/run-tests.yml         |  2 +-
 Makefile                                |  2 +-
 specs/_features/eip7549/beacon-chain.md |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0367da9dd..ef2eff9e2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -181,6 +181,19 @@ jobs:
           command: make citest fork=eip7002
       - store_test_results:
           path: tests/core/pyspec/test-reports
+  test-eip7549:
+    docker:
+      - image: circleci/python:3.9
+    working_directory: ~/specs-repo
+    steps:
+      - restore_cache:
+          key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
+      - restore_pyspec_cached_venv
+      - run:
+          name: Run py-tests
+          command: make citest fork=eip7549
+      - store_test_results:
+          path: tests/core/pyspec/test-reports
   test-whisk:
     docker:
       - image: circleci/python:3.9
@@ -333,6 +346,9 @@ workflows:
       - test-eip7002:
           requires:
             - install_pyspec_test
+      - test-eip7549:
+          requires:
+            - install_pyspec_test
       - test-whisk:
           requires:
             - install_pyspec_test
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 2973afb06..969321797 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -71,7 +71,7 @@ jobs:
     needs: [preclear,lint,codespell,table_of_contents]
     strategy:
       matrix:
-        version: ["phase0", "altair", "bellatrix", "capella", "deneb", "eip6110", "eip7002", "whisk", "eip7594"]
+        version: ["phase0", "altair", "bellatrix", "capella", "deneb", "eip6110", "eip7002", "eip7549", "whisk", "eip7594"]
     steps:
       - name: Checkout this repo
         uses: actions/checkout@v3.2.0
diff --git a/Makefile b/Makefile
index d0d750e89..c6bc8dd84 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/*/*.md) \
                  $(wildcard $(SPEC_DIR)/_features/*/*/*.md) \
                  $(wildcard $(SSZ_DIR)/*.md)
 
-ALL_EXECUTABLE_SPEC_NAMES = phase0 altair bellatrix capella deneb eip6110 eip7002 whisk
+ALL_EXECUTABLE_SPEC_NAMES = phase0 altair bellatrix capella deneb eip6110 eip7002 eip7549 whisk
 # The parameters for commands. Use `foreach` to avoid listing specs again.
 COVERAGE_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), --cov=eth2spec.$S.$(TEST_PRESET_TYPE))
 PYLINT_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), ./eth2spec/$S)
diff --git a/specs/_features/eip7549/beacon-chain.md b/specs/_features/eip7549/beacon-chain.md
index 3b20e0c63..9ee88e7de 100644
--- a/specs/_features/eip7549/beacon-chain.md
+++ b/specs/_features/eip7549/beacon-chain.md
@@ -101,7 +101,7 @@ def get_attesting_indices(state: BeaconState, attestation: Attestation) -> Set[V
     """
     Return the set of attesting indices corresponding to ``aggregation_bits`` and ``committee_bits``.
     """
-    output = set()
+    output: Set[ValidatorIndex] = set()
     committee_indices = get_committee_indices(attestation.committee_bits)
     committee_offset = 0
     for index in committee_indices: