diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 6aaaed2e3..c3cf52d25 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,7 +9,10 @@ env: on: push: - pull_request: + branches: + - dev + - master + pull_request: workflow_dispatch: inputs: test_preset_type: diff --git a/pysetup/spec_builders/whisk.py b/pysetup/spec_builders/whisk.py index e9cd4a67d..2c2faeb42 100644 --- a/pysetup/spec_builders/whisk.py +++ b/pysetup/spec_builders/whisk.py @@ -1,3 +1,4 @@ +from typing import Dict from .base import BaseSpecBuilder from ..constants import WHISK @@ -9,6 +10,7 @@ class WhiskSpecBuilder(BaseSpecBuilder): def imports(cls, preset_name: str): return f''' from eth2spec.capella import {preset_name} as capella +import curdleproofs ''' @classmethod @@ -17,4 +19,13 @@ from eth2spec.capella import {preset_name} as capella return { 'WHISK_MAX_SHUFFLE_PROOF_SIZE': spec_object.preset_vars['WHISK_MAX_SHUFFLE_PROOF_SIZE'].value, 'WHISK_MAX_OPENING_PROOF_SIZE': spec_object.preset_vars['WHISK_MAX_OPENING_PROOF_SIZE'].value, + 'WHISK_VALIDATORS_PER_SHUFFLE': spec_object.preset_vars['WHISK_VALIDATORS_PER_SHUFFLE'].value, + 'CURDLEPROOFS_N_BLINDERS': spec_object.preset_vars['CURDLEPROOFS_N_BLINDERS'].value, } + + @classmethod + def hardcoded_ssz_dep_constants(cls) -> Dict[str, str]: + constants = { + 'EXECUTION_PAYLOAD_INDEX': 'GeneralizedIndex(41)', + } + return {**super().hardcoded_ssz_dep_constants(), **constants}