Merge pull request #2382 from ethereum/vbuterin-patch-12
Reorganization of config params to put sync committee in one section
This commit is contained in:
commit
71eea1a0f1
|
@ -10,20 +10,20 @@ MIN_SLASHING_PENALTY_QUOTIENT_ALTAIR: 64
|
||||||
PROPORTIONAL_SLASHING_MULTIPLIER_ALTAIR: 2
|
PROPORTIONAL_SLASHING_MULTIPLIER_ALTAIR: 2
|
||||||
|
|
||||||
|
|
||||||
# Misc
|
# Sync committee
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
# 2**9 (= 512)
|
# 2**9 (= 512)
|
||||||
SYNC_COMMITTEE_SIZE: 512
|
SYNC_COMMITTEE_SIZE: 512
|
||||||
# 2**2 (= 4)
|
|
||||||
INACTIVITY_SCORE_BIAS: 4
|
|
||||||
|
|
||||||
|
|
||||||
# Time parameters
|
|
||||||
# ---------------------------------------------------------------
|
|
||||||
# 2**9 (= 512)
|
# 2**9 (= 512)
|
||||||
EPOCHS_PER_SYNC_COMMITTEE_PERIOD: 512
|
EPOCHS_PER_SYNC_COMMITTEE_PERIOD: 512
|
||||||
|
|
||||||
|
|
||||||
|
# Misc
|
||||||
|
# ---------------------------------------------------------------
|
||||||
|
# 2**2 (= 4)
|
||||||
|
INACTIVITY_SCORE_BIAS: 4
|
||||||
|
|
||||||
|
|
||||||
# Signature domains
|
# Signature domains
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
DOMAIN_SYNC_COMMITTEE: 0x07000000
|
DOMAIN_SYNC_COMMITTEE: 0x07000000
|
||||||
|
|
|
@ -10,20 +10,20 @@ MIN_SLASHING_PENALTY_QUOTIENT_ALTAIR: 64
|
||||||
PROPORTIONAL_SLASHING_MULTIPLIER_ALTAIR: 2
|
PROPORTIONAL_SLASHING_MULTIPLIER_ALTAIR: 2
|
||||||
|
|
||||||
|
|
||||||
# Misc
|
# Sync committee
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
# [customized]
|
# [customized]
|
||||||
SYNC_COMMITTEE_SIZE: 32
|
SYNC_COMMITTEE_SIZE: 32
|
||||||
# 2**2 (= 4)
|
|
||||||
INACTIVITY_SCORE_BIAS: 4
|
|
||||||
|
|
||||||
|
|
||||||
# Time parameters
|
|
||||||
# ---------------------------------------------------------------
|
|
||||||
# [customized]
|
# [customized]
|
||||||
EPOCHS_PER_SYNC_COMMITTEE_PERIOD: 8
|
EPOCHS_PER_SYNC_COMMITTEE_PERIOD: 8
|
||||||
|
|
||||||
|
|
||||||
|
# Misc
|
||||||
|
# ---------------------------------------------------------------
|
||||||
|
# 2**2 (= 4)
|
||||||
|
INACTIVITY_SCORE_BIAS: 4
|
||||||
|
|
||||||
|
|
||||||
# Signature domains
|
# Signature domains
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
DOMAIN_SYNC_COMMITTEE: 0x07000000
|
DOMAIN_SYNC_COMMITTEE: 0x07000000
|
||||||
|
@ -45,6 +45,7 @@ ALTAIR_FORK_EPOCH: 18446744073709551615
|
||||||
MIN_SYNC_COMMITTEE_PARTICIPANTS: 1
|
MIN_SYNC_COMMITTEE_PARTICIPANTS: 1
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Validator
|
# Validator
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
# 2**2 (= 4)
|
# 2**2 (= 4)
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
- [Misc](#misc)
|
- [Misc](#misc)
|
||||||
- [Configuration](#configuration)
|
- [Configuration](#configuration)
|
||||||
- [Updated penalty values](#updated-penalty-values)
|
- [Updated penalty values](#updated-penalty-values)
|
||||||
|
- [Sync committee](#sync-committee)
|
||||||
- [Misc](#misc-1)
|
- [Misc](#misc-1)
|
||||||
- [Time parameters](#time-parameters)
|
|
||||||
- [Domain types](#domain-types)
|
- [Domain types](#domain-types)
|
||||||
- [Containers](#containers)
|
- [Containers](#containers)
|
||||||
- [Modified containers](#modified-containers)
|
- [Modified containers](#modified-containers)
|
||||||
|
@ -114,19 +114,19 @@ This patch updates a few configuration values to move penalty parameters closer
|
||||||
| `MIN_SLASHING_PENALTY_QUOTIENT_ALTAIR` | `uint64(2**6)` (= 64) |
|
| `MIN_SLASHING_PENALTY_QUOTIENT_ALTAIR` | `uint64(2**6)` (= 64) |
|
||||||
| `PROPORTIONAL_SLASHING_MULTIPLIER_ALTAIR` | `uint64(2)` |
|
| `PROPORTIONAL_SLASHING_MULTIPLIER_ALTAIR` | `uint64(2)` |
|
||||||
|
|
||||||
|
### Sync committee
|
||||||
|
|
||||||
|
| Name | Value | Unit | Duration |
|
||||||
|
| - | - | - | - |
|
||||||
|
| `SYNC_COMMITTEE_SIZE` | `uint64(2**9)` (= 512) | Validators | |
|
||||||
|
| `EPOCHS_PER_SYNC_COMMITTEE_PERIOD` | `uint64(2**9)` (= 512) | epochs | ~54 hours |
|
||||||
|
|
||||||
### Misc
|
### Misc
|
||||||
|
|
||||||
| Name | Value |
|
| Name | Value |
|
||||||
| - | - |
|
| - | - |
|
||||||
| `SYNC_COMMITTEE_SIZE` | `uint64(2**9)` (= 512) |
|
|
||||||
| `INACTIVITY_SCORE_BIAS` | `uint64(4)` |
|
| `INACTIVITY_SCORE_BIAS` | `uint64(4)` |
|
||||||
|
|
||||||
### Time parameters
|
|
||||||
|
|
||||||
| Name | Value | Unit | Duration |
|
|
||||||
| - | - | :-: | :-: |
|
|
||||||
| `EPOCHS_PER_SYNC_COMMITTEE_PERIOD` | `uint64(2**9)` (= 512) | epochs | ~54 hours |
|
|
||||||
|
|
||||||
### Domain types
|
### Domain types
|
||||||
|
|
||||||
| Name | Value |
|
| Name | Value |
|
||||||
|
|
|
@ -369,7 +369,7 @@ def test_valid_signature_future_committee(spec, state):
|
||||||
yield from run_sync_committee_processing(spec, state, block)
|
yield from run_sync_committee_processing(spec, state, block)
|
||||||
|
|
||||||
|
|
||||||
@with_all_phases_except([PHASE0])
|
@with_altair_and_later
|
||||||
@spec_state_test
|
@spec_state_test
|
||||||
def test_sync_committee_is_only_computed_at_epoch_boundary(spec, state):
|
def test_sync_committee_is_only_computed_at_epoch_boundary(spec, state):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue