Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/nightly-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- deneb
- electra
- fulu
- eip7732
- gloas
- eip7805
steps:
- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- deneb
- electra
- fulu
- eip7732
- gloas
- eip7805
steps:
- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ tests/core/pyspec/eth2spec/capella/
tests/core/pyspec/eth2spec/deneb/
tests/core/pyspec/eth2spec/electra/
tests/core/pyspec/eth2spec/fulu/
tests/core/pyspec/eth2spec/gloas/
tests/core/pyspec/eth2spec/eip6800/
tests/core/pyspec/eth2spec/eip7441/
tests/core/pyspec/eth2spec/eip7732/
tests/core/pyspec/eth2spec/eip7805/

# coverage reports
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ ALL_EXECUTABLE_SPEC_NAMES = \
deneb \
electra \
fulu \
gloas \
eip6800 \
eip7441 \
eip7732 \
eip7805

# A list of fake targets.
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ ready.

### In-development Specifications

| Seq. | Code Name | Fork Epoch | Links |
| ---- | --------- | ---------- | ------------------------------------------------------------------ |
| 6 | **Fulu** | TBD | [Specs](specs/fulu), [Tests](tests/core/pyspec/eth2spec/test/fulu) |
| Seq. | Code Name | Fork Epoch | Links |
| ---- | --------- | ---------- | -------------------------------------------------------------------- |
| 6 | **Fulu** | TBD | [Specs](specs/fulu), [Tests](tests/core/pyspec/eth2spec/test/fulu) |
| 7 | **Gloas** | TBD | [Specs](specs/gloas), [Tests](tests/core/pyspec/eth2spec/test/gloas) |

### Accompanying documents

Expand Down
26 changes: 12 additions & 14 deletions configs/mainnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ ELECTRA_FORK_EPOCH: 364032 # May 7, 2025, 10:05:11am UTC
# Fulu
FULU_FORK_VERSION: 0x06000000
FULU_FORK_EPOCH: 18446744073709551615 # temporary stub
# Gloas
GLOAS_FORK_VERSION: 0x07000000 # temporary stub
GLOAS_FORK_EPOCH: 18446744073709551615
# EIP7441
EIP7441_FORK_VERSION: 0x08000000 # temporary stub
EIP7441_FORK_EPOCH: 18446744073709551615
# EIP7732
EIP7732_FORK_VERSION: 0x09000000 # temporary stub
EIP7732_FORK_EPOCH: 18446744073709551615
# EIP7805
EIP7805_FORK_VERSION: 0x0a000000 # temporary stub
EIP7805_FORK_EPOCH: 18446744073709551615
Expand Down Expand Up @@ -92,15 +92,15 @@ SYNC_MESSAGE_DUE_BPS: 3333
# 6667 basis points, ~67% of SLOT_DURATION_MS
CONTRIBUTION_DUE_BPS: 6667

# EIP7732
# Gloas
# 2500 basis points, 25% of SLOT_DURATION_MS
ATTESTATION_DUE_BPS_EIP7732: 2500
ATTESTATION_DUE_BPS_GLOAS: 2500
# 5000 basis points, 50% of SLOT_DURATION_MS
AGGREGRATE_DUE_BPS_EIP7732: 5000
AGGREGRATE_DUE_BPS_GLOAS: 5000
# 2500 basis points, 25% of SLOT_DURATION_MS
SYNC_MESSAGE_DUE_BPS_EIP7732: 2500
SYNC_MESSAGE_DUE_BPS_GLOAS: 2500
# 5000 basis points, 50% of SLOT_DURATION_MS
CONTRIBUTION_DUE_BPS_EIP7732: 5000
CONTRIBUTION_DUE_BPS_GLOAS: 5000
# 7500 basis points, 75% of SLOT_DURATION_MS
PAYLOAD_ATTESTATION_DUE_BPS: 7500

Expand Down Expand Up @@ -220,18 +220,16 @@ BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000
# 2**12 (= 4,096) epochs
MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096

# Gloas
# 2**7 (= 128) payloads
MAX_REQUEST_PAYLOADS: 128

# EIP7441
# 2**8 (= 256) epochs
EPOCHS_PER_SHUFFLING_PHASE: 256
# 2**1 (= 2) epochs
PROPOSER_SELECTION_GAP: 2

# EIP7732
# 2**7 (= 128) payloads
MAX_REQUEST_PAYLOADS: 128
# 20%
PROPOSER_SCORE_BOOST_EIP7732: 20

# EIP7805
# 2**4 (= 16) inclusion lists
MAX_REQUEST_INCLUSION_LIST: 16
Expand Down
26 changes: 12 additions & 14 deletions configs/minimal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ ELECTRA_FORK_EPOCH: 18446744073709551615
# [customized] Fulu
FULU_FORK_VERSION: 0x06000001
FULU_FORK_EPOCH: 18446744073709551615
# [customized] Gloas
GLOAS_FORK_VERSION: 0x07000001
GLOAS_FORK_EPOCH: 18446744073709551615
# [customized] EIP7441
EIP7441_FORK_VERSION: 0x08000001
EIP7441_FORK_EPOCH: 18446744073709551615
# [customized] EIP7732
EIP7732_FORK_VERSION: 0x09000001
EIP7732_FORK_EPOCH: 18446744073709551615
# [customized] EIP7805
EIP7805_FORK_VERSION: 0x0a000001
EIP7805_FORK_EPOCH: 18446744073709551615
Expand Down Expand Up @@ -88,15 +88,15 @@ SYNC_MESSAGE_DUE_BPS: 3333
# 6667 basis points, ~67% of SLOT_DURATION_MS
CONTRIBUTION_DUE_BPS: 6667

# EIP7732
# Gloas
# 2500 basis points, 25% of SLOT_DURATION_MS
ATTESTATION_DUE_BPS_EIP7732: 2500
ATTESTATION_DUE_BPS_GLOAS: 2500
# 5000 basis points, 50% of SLOT_DURATION_MS
AGGREGRATE_DUE_BPS_EIP7732: 5000
AGGREGRATE_DUE_BPS_GLOAS: 5000
# 2500 basis points, 25% of SLOT_DURATION_MS
SYNC_MESSAGE_DUE_BPS_EIP7732: 2500
SYNC_MESSAGE_DUE_BPS_GLOAS: 2500
# 5000 basis points, 50% of SLOT_DURATION_MS
CONTRIBUTION_DUE_BPS_EIP7732: 5000
CONTRIBUTION_DUE_BPS_GLOAS: 5000
# 7500 basis points, 75% of SLOT_DURATION_MS
PAYLOAD_ATTESTATION_DUE_BPS: 7500

Expand Down Expand Up @@ -217,18 +217,16 @@ BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000
# 2**12 (= 4,096) epochs
MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096

# Gloas
# 2**7 (= 128) payloads
MAX_REQUEST_PAYLOADS: 128

# EIP7441
# [customized] 2**2 (= 4) epochs
EPOCHS_PER_SHUFFLING_PHASE: 4
# [customized] 2**0 (= 1) epochs
PROPOSER_SELECTION_GAP: 1

# EIP7732
# 2**7 (= 128) payloads
MAX_REQUEST_PAYLOADS: 128
# 20%
PROPOSER_SCORE_BOOST_EIP7732: 20

# EIP7805
# 2**4 (= 16) inclusion lists
MAX_REQUEST_INCLUSION_LIST: 16
Expand Down
4 changes: 2 additions & 2 deletions presets/mainnet/eip7732.yaml → presets/mainnet/gloas.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Mainnet preset - EIP7732
# Mainnet preset - Gloas

# Networking
# ---------------------------------------------------------------
# floorlog2(get_generalized_index(BeaconBlockBody, "signed_execution_payload_header", "message", "blob_kzg_commitments_root")) (= 9)
KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH_EIP7732: 9
KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH_GLOAS: 9

# Execution
# ---------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions presets/minimal/eip7732.yaml → presets/minimal/gloas.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Minimal preset - EIP7732
# Minimal preset - Gloas

# Networking
# ---------------------------------------------------------------
# floorlog2(get_generalized_index(BeaconBlockBody, "signed_execution_payload_header", "message", "blob_kzg_commitments_root")) (= 9)
KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH_EIP7732: 9
KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH_GLOAS: 9

# Execution
# ---------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion pysetup/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
DENEB = "deneb"
ELECTRA = "electra"
FULU = "fulu"
GLOAS = "gloas"
EIP6800 = "eip6800"
EIP7441 = "eip7441"
EIP7732 = "eip7732"
EIP7805 = "eip7805"


Expand Down
4 changes: 2 additions & 2 deletions pysetup/md_doc_paths.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
DENEB,
EIP6800,
EIP7441,
EIP7732,
EIP7805,
ELECTRA,
FULU,
GLOAS,
PHASE0,
)

Expand All @@ -22,9 +22,9 @@
DENEB: CAPELLA,
ELECTRA: DENEB,
FULU: ELECTRA,
GLOAS: FULU,
EIP6800: DENEB,
EIP7441: CAPELLA,
EIP7732: FULU,
EIP7805: FULU,
}

Expand Down
4 changes: 2 additions & 2 deletions pysetup/spec_builders/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
from .deneb import DenebSpecBuilder
from .eip6800 import EIP6800SpecBuilder
from .eip7441 import EIP7441SpecBuilder
from .eip7732 import EIP7732SpecBuilder
from .eip7805 import EIP7805SpecBuilder
from .electra import ElectraSpecBuilder
from .fulu import FuluSpecBuilder
from .gloas import GloasSpecBuilder
from .phase0 import Phase0SpecBuilder

spec_builders = {
Expand All @@ -20,9 +20,9 @@
DenebSpecBuilder,
ElectraSpecBuilder,
FuluSpecBuilder,
GloasSpecBuilder,
EIP6800SpecBuilder,
EIP7441SpecBuilder,
EIP7732SpecBuilder,
EIP7805SpecBuilder,
)
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from ..constants import EIP7732
from ..constants import GLOAS
from .base import BaseSpecBuilder


class EIP7732SpecBuilder(BaseSpecBuilder):
fork: str = EIP7732
class GloasSpecBuilder(BaseSpecBuilder):
fork: str = GLOAS

@classmethod
def imports(cls, preset_name: str):
Expand Down
Loading