Skip to content

Change Store.inclusion_list from List to Set #4165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2025
Merged

Change Store.inclusion_list from List to Set #4165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c901082
Change Store.inclusion_list to a Sequence
jtraglia Mar 13, 2025
c27ca05
Change Sequence to Set
jtraglia Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,16 @@ gen_all: $(GENERATOR_TARGETS)

# Detect errors in generators.
detect_errors: $(TEST_VECTOR_DIR)
@find $(TEST_VECTOR_DIR) -name "INCOMPLETE"
@incomplete_files=$$(find $(TEST_VECTOR_DIR) -name "INCOMPLETE"); \
if [ -n "$$incomplete_files" ]; then \
echo "[ERROR] incomplete detected"; \
exit 1; \
fi
@if [ -f $(GENERATOR_ERROR_LOG_FILE) ]; then \
echo "[ERROR] $(GENERATOR_ERROR_LOG_FILE) file exists"; \
else \
echo "[PASSED] error log file does not exist"; \
exit 1; \
fi
@echo "[PASSED] no errors detected"

# Generate KZG trusted setups for testing.
kzg_setups: pyspec
Expand Down
4 changes: 2 additions & 2 deletions specs/_features/eip7805/fork-choice.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class Store(object):
latest_messages: Dict[ValidatorIndex, LatestMessage] = field(default_factory=dict)
unrealized_justifications: Dict[Root, Checkpoint] = field(default_factory=dict)
# [New in EIP-7805]
inclusion_lists: Dict[Tuple[Slot, Root], List[InclusionList]] = field(default_factory=dict)
inclusion_lists: Dict[Tuple[Slot, Root], Set[InclusionList]] = field(default_factory=dict)
inclusion_list_equivocators: Dict[Tuple[Slot, Root], Set[ValidatorIndex]] = field(default_factory=dict)
unsatisfied_inclusion_list_blocks: Set[Root] = field(default_factory=Set)
```
Expand Down Expand Up @@ -200,5 +200,5 @@ def on_inclusion_list(
store.inclusion_list_equivocators[(message.slot, root)].add(validator_index)
# This inclusion list is not an equivocation. Store it if prior to the view freeze deadline
elif is_before_freeze_deadline:
store.inclusion_lists[(message.slot, root)].append(message)
store.inclusion_lists[(message.slot, root)].add(message)
```