Merge pull request #3618 from dapplion/eip-7251

Add EIP-7251 spec: Increase MAX_EFFECTIVE_BALANCE

.gitignore

@@ -25,6 +25,7 @@ tests/core/pyspec/eth2spec/eip6110/
 tests/core/pyspec/eth2spec/eip7002/
 tests/core/pyspec/eth2spec/eip7549/
 tests/core/pyspec/eth2spec/whisk/
+tests/core/pyspec/eth2spec/eip7251/
 tests/core/pyspec/eth2spec/eip7594/
 
 # coverage reports

configs/mainnet.yaml

@@ -59,6 +59,9 @@ EIP6110_FORK_EPOCH: 18446744073709551615
 # EIP7002
 EIP7002_FORK_VERSION: 0x07000000  # temporary stub
 EIP7002_FORK_EPOCH: 18446744073709551615
+# EIP7251
+EIP7251_FORK_VERSION: 0x06000000  # temporary stub
+EIP7251_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x08000000  # temporary stub
 WHISK_FORK_EPOCH: 18446744073709551615
@@ -161,3 +164,8 @@ WHISK_PROPOSER_SELECTION_GAP: 2
 # EIP7594
 EIP7594_FORK_VERSION: 0x06000001
 EIP7594_FORK_EPOCH: 18446744073709551615
+
+# [New in EIP7251]
+MIN_PER_EPOCH_CHURN_LIMIT_EIP7251: 128000000000 # 2**7 * 10**9 (= 128,000,000,000)
+MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000 # 2**8 * 10**9 (= 256,000,000,000)
+

configs/minimal.yaml

@@ -58,6 +58,9 @@ EIP6110_FORK_EPOCH: 18446744073709551615
 # EIP7002
 EIP7002_FORK_VERSION: 0x07000001
 EIP7002_FORK_EPOCH: 18446744073709551615
+# EIP7251
+EIP7251_FORK_VERSION: 0x06000000  # temporary stub
+EIP7251_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x08000001
 WHISK_FORK_EPOCH: 18446744073709551615
@@ -160,3 +163,7 @@ WHISK_PROPOSER_SELECTION_GAP: 1
 # EIP7594
 EIP7594_FORK_VERSION: 0x06000001
 EIP7594_FORK_EPOCH: 18446744073709551615
+
+# [New in EIP7251]
+MIN_PER_EPOCH_CHURN_LIMIT_EIP7251: 64000000000 # 2**6 * 10**9 (= 64,000,000,000)
+MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 128000000000 # 2**7 * 10**9 (= 128,000,000,000)

presets/mainnet/eip7251.yaml

@@ -0,0 +1,28 @@
+# Mainnet preset - EIP7251
+
+# Gwei values
+# ---------------------------------------------------------------
+# 2**5 * 10**9 (= 32,000,000,000) Gwei
+MIN_ACTIVATION_BALANCE: 32000000000
+# 2**11 * 10**9 (= 2,048,000,000,000) Gwei
+MAX_EFFECTIVE_BALANCE_EIP7251: 2048000000000
+
+# State list lengths
+# ---------------------------------------------------------------
+PENDING_BALANCE_DEPOSITS_LIMIT: 134217728
+PENDING_PARTIAL_WITHDRAWALS_LIMIT: 134217728
+PENDING_CONSOLIDATIONS_LIMIT: 262144
+
+# Reward and penalty quotients
+# ---------------------------------------------------------------
+MIN_SLASHING_PENALTY_QUOTIENT_EIP7251: 4096
+WHISTLEBLOWER_REWARD_QUOTIENT_EIP7251: 4096
+
+# Max operations per block
+# ---------------------------------------------------------------
+MAX_CONSOLIDATIONS: 1
+
+# Execution
+# ---------------------------------------------------------------
+# 2**3 (= 8) partial withdrawals
+MAX_PARTIAL_WITHDRAWALS_PER_PAYLOAD: 8

presets/minimal/eip7251.yaml

@@ -0,0 +1,30 @@
+# Minimal preset - EIP7251
+
+# Gwei values
+# ---------------------------------------------------------------
+# 2**5 * 10**9 (= 32,000,000,000) Gwei
+MIN_ACTIVATION_BALANCE: 32000000000
+# 2**11 * 10**9 (= 2,048,000,000,000) Gwei
+MAX_EFFECTIVE_BALANCE_EIP7251: 2048000000000
+
+# State list lengths
+# ---------------------------------------------------------------
+PENDING_BALANCE_DEPOSITS_LIMIT: 134217728
+# [customized] smaller queue
+PENDING_PARTIAL_WITHDRAWALS_LIMIT: 64
+# [customized] smaller queue
+PENDING_CONSOLIDATIONS_LIMIT: 64
+
+# Reward and penalty quotients
+# ---------------------------------------------------------------
+MIN_SLASHING_PENALTY_QUOTIENT_EIP7251: 4096
+WHISTLEBLOWER_REWARD_QUOTIENT_EIP7251: 4096
+
+# Max operations per block
+# ---------------------------------------------------------------
+MAX_CONSOLIDATIONS: 1
+
+# Execution
+# ---------------------------------------------------------------
+# [customized] 2**1 (= 2)
+MAX_PARTIAL_WITHDRAWALS_PER_PAYLOAD: 2

pysetup/constants.py

@@ -6,6 +6,7 @@
 DENEB = 'deneb'
 EIP6110 = 'eip6110'
 EIP7002 = 'eip7002'
+EIP7251 = 'eip7251'
 EIP7549 = 'eip7549'
 WHISK = 'whisk'
 EIP7594 = 'eip7594'

pysetup/md_doc_paths.py

@@ -8,6 +8,7 @@
     DENEB,
     EIP6110,
     EIP7002,
+    EIP7251,
     EIP7549,
     WHISK,
     EIP7594,
@@ -24,6 +25,7 @@
     EIP7549: DENEB,
     WHISK: CAPELLA,
     EIP7002: CAPELLA,
+    EIP7251: DENEB,
     EIP7594: DENEB,
 }
 

pysetup/spec_builders/__init__.py

@@ -7,13 +7,15 @@
 from .eip7002 import EIP7002SpecBuilder
 from .eip7549 import EIP7549SpecBuilder
 from .whisk import WhiskSpecBuilder
+from .eip7251 import EIP7251SpecBuilder
 from .eip7594 import EIP7594SpecBuilder
 
 
 spec_builders = {
     builder.fork: builder
     for builder in (
         Phase0SpecBuilder, AltairSpecBuilder, BellatrixSpecBuilder, CapellaSpecBuilder, DenebSpecBuilder,
-        EIP6110SpecBuilder, EIP7002SpecBuilder, EIP7549SpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder,
+        EIP6110SpecBuilder, EIP7002SpecBuilder, EIP7549SpecBuilder, WhiskSpecBuilder, EIP7251SpecBuilder,
+        EIP7594SpecBuilder,
     )
 }

pysetup/spec_builders/eip7251.py

@@ -0,0 +1,24 @@
+from typing import Dict
+
+from .base import BaseSpecBuilder
+from ..constants import EIP7251
+
+
+class EIP7251SpecBuilder(BaseSpecBuilder):
+    fork: str = EIP7251
+
+    @classmethod
+    def imports(cls, preset_name: str):
+        return super().imports(preset_name) + f'''
+from eth2spec.deneb import {preset_name} as deneb
+'''
+
+## TODO: deal with changed gindices
+
+    @classmethod
+    def hardcoded_ssz_dep_constants(cls) -> Dict[str, str]:
+        return {
+            'FINALIZED_ROOT_GINDEX': 'GeneralizedIndex(169)',
+            'CURRENT_SYNC_COMMITTEE_GINDEX': 'GeneralizedIndex(86)',
+            'NEXT_SYNC_COMMITTEE_GINDEX': 'GeneralizedIndex(87)',
+        }