Skip to content
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

Remove Shards/Crosslinks from Phase 0 #1428

Merged
merged 24 commits into from
Oct 28, 2019
Merged

Remove Shards/Crosslinks from Phase 0 #1428

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
dfdf3ab
initial removal and cleanup of shard/crosslink from phase 0
djrtwo Oct 12, 2019
b3b9b43
working through phase 0 tests after crosslink/shard removal
djrtwo Oct 12, 2019
d98cabf
fix get crosslink committee and finalitytests
djrtwo Oct 12, 2019
667bf67
temporarily disable phase 1 tests
djrtwo Oct 12, 2019
b3a0a03
remove some legacy code
djrtwo Oct 12, 2019
5ccac7c
remove get_committee_count
djrtwo Oct 12, 2019
1fbf7f8
fix config files
djrtwo Oct 12, 2019
c392db3
fix max epochs var
djrtwo Oct 12, 2019
d8431f8
add start index back in
djrtwo Oct 13, 2019
6208e74
get crosslink committees by slot
djrtwo Oct 13, 2019
bd1c71b
simplify index
djrtwo Oct 16, 2019
219084a
add CommitteeIndex type
djrtwo Oct 16, 2019
c239ce0
crosslink committee -> beacon committee
djrtwo Oct 17, 2019
7af2c23
remove refs to crosslinks
djrtwo Oct 17, 2019
283a8cb
remove refs to crosslinks
djrtwo Oct 17, 2019
437a65d
cleanup wrt Justin's comments
djrtwo Oct 17, 2019
fbcc2a4
fix comment re: proto
djrtwo Oct 18, 2019
58c2834
proto pr feedback
djrtwo Oct 18, 2019
d5a2535
minor comments resolved from hww
djrtwo Oct 18, 2019
a11b012
update constants for phase 0 simplification
djrtwo Oct 20, 2019
e86ff1e
minor fix to mainnet config comments
djrtwo Oct 20, 2019
f809b21
minor pr review
djrtwo Oct 23, 2019
934008e
Merge branch 'phase0-simplify' of github.com:ethereum/eth2.0-specs in…
djrtwo Oct 23, 2019
13c3d9c
Update ToCs
hwwhww Oct 23, 2019
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
16 changes: 8 additions & 8 deletions configs/mainnet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

# Misc
# ---------------------------------------------------------------
# 2**10 (= 1,024)
SHARD_COUNT: 1024
# 2**6 (= 64)
MAX_COMMITTEES_PER_SLOT: 64
# 2**7 (= 128)
TARGET_COMMITTEE_SIZE: 128
# 2**12 (= 4,096)
MAX_VALIDATORS_PER_COMMITTEE: 4096
# 2**11 (= 2,048)
MAX_VALIDATORS_PER_COMMITTEE: 2048
# 2**2 (= 4)
MIN_PER_EPOCH_CHURN_LIMIT: 4
# 2**16 (= 65,536)
Expand Down Expand Up @@ -51,12 +51,12 @@ BLS_WITHDRAWAL_PREFIX: 0x00

# Time parameters
# ---------------------------------------------------------------
# 6 seconds 6 seconds
SECONDS_PER_SLOT: 6
# 12 seconds
SECONDS_PER_SLOT: 12
# 2**0 (= 1) slots 6 seconds
MIN_ATTESTATION_INCLUSION_DELAY: 1
# 2**6 (= 64) slots 6.4 minutes
SLOTS_PER_EPOCH: 64
# 2**5 (= 32) slots 6.4 minutes
SLOTS_PER_EPOCH: 32
# 2**0 (= 1) epochs 6.4 minutes
MIN_SEED_LOOKAHEAD: 1
# 2**2 (= 4) epochs 25.6 minutes
Expand Down
10 changes: 5 additions & 5 deletions configs/minimal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
# Misc
# ---------------------------------------------------------------

# [customized] Just 8 shards for testing purposes
SHARD_COUNT: 8
# [customized] Just 4 committees for slot for testing purposes
MAX_COMMITTEES_PER_SLOT: 4
djrtwo marked this conversation as resolved.
Show resolved Hide resolved
# [customized] unsecure, but fast
TARGET_COMMITTEE_SIZE: 4
# 2**12 (= 4,096)
MAX_VALIDATORS_PER_COMMITTEE: 4096
# 2**11 (= 2,048)
MAX_VALIDATORS_PER_COMMITTEE: 2048
# 2**2 (= 4)
MIN_PER_EPOCH_CHURN_LIMIT: 4
# 2**16 (= 65,536)
Expand Down Expand Up @@ -50,7 +50,7 @@ BLS_WITHDRAWAL_PREFIX: 0x00

# Time parameters
# ---------------------------------------------------------------
# 6 seconds 6 seconds
# [customized] Faster for testing purposes
SECONDS_PER_SLOT: 6
# 2**0 (= 1) slots 6 seconds
MIN_ATTESTATION_INCLUSION_DELAY: 1
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def apply_constants_preset(preset: Dict[str, Any]) -> None:
global_vars[k] = v

# Deal with derived constants
global_vars['GENESIS_EPOCH'] = compute_epoch_of_slot(GENESIS_SLOT)
global_vars['GENESIS_EPOCH'] = compute_epoch_at_slot(GENESIS_SLOT)

# Initialize SSZ types again, to account for changed lengths
init_SSZ_types()
Expand Down
Loading