Merge pull request #1504 from ethereum/phase1rebase

Phase 1 rebase

Makefile

@@ -118,7 +118,9 @@ $(PY_SPEC_PHASE_0_TARGETS): $(PY_SPEC_PHASE_0_DEPS)
 	python3 $(SCRIPT_DIR)/build_spec.py -p0 $(PHASE0_SPEC_DIR)/beacon-chain.md $(PHASE0_SPEC_DIR)/fork-choice.md $(PHASE0_SPEC_DIR)/validator.md $@
 
 $(PY_SPEC_DIR)/eth2spec/phase1/spec.py: $(PY_SPEC_PHASE_1_DEPS)
-	python3 $(SCRIPT_DIR)/build_spec.py -p1 $(PHASE0_SPEC_DIR)/beacon-chain.md $(PHASE0_SPEC_DIR)/fork-choice.md $(SSZ_DIR)/merkle-proofs.md $(PHASE1_SPEC_DIR)/custody-game.md $(PHASE1_SPEC_DIR)/shard-data-chains.md $(PHASE1_SPEC_DIR)/beacon-chain-misc.md $@
+	python3 $(SCRIPT_DIR)/build_spec.py -p1 $(PHASE0_SPEC_DIR)/beacon-chain.md $(PHASE0_SPEC_DIR)/fork-choice.md $(PHASE1_SPEC_DIR)/custody-game.md $(PHASE1_SPEC_DIR)/beacon-chain.md $(PHASE1_SPEC_DIR)/fraud-proofs.md $(PHASE1_SPEC_DIR)/fork-choice.md $(PHASE1_SPEC_DIR)/phase1-fork.md $@
+
+# TODO: also build validator spec and light-client-sync
 
 CURRENT_DIR = ${CURDIR}
 

README.md

@@ -16,11 +16,13 @@ Core specifications for Eth2 clients be found in [specs/](specs/). These are div
 * [Fork Choice](specs/phase0/fork-choice.md)
 * [Deposit Contract](specs/phase0/deposit-contract.md)
 * [Honest Validator](specs/phase0/validator.md)
+* [P2P Networking](specs/phase0/p2p-interface.md)
 
 ### Phase 1
+* [From Phase 0 to Phase 1](specs/phase1/phase1-fork.md)
+* [The Beacon Chain for Shards](specs/phase1/beacon-chain.md)
 * [Custody Game](specs/phase1/custody-game.md)
-* [Shard Data Chains](specs/phase1/shard-data-chains.md)
-* [Misc beacon chain updates](specs/phase1/beacon-chain-misc.md)
+* [Shard Transition and Fraud Proofs](specs/phase1/fraud-proofs.md)
 * [Light client syncing protocol](specs/phase1/light-client-sync.md)
 
 ### Phase 2

configs/mainnet.yaml

@@ -94,9 +94,6 @@ PERSISTENT_COMMITTEE_PERIOD: 2048
 MAX_EPOCHS_PER_CROSSLINK: 64
 # 2**2 (= 4) epochs 25.6 minutes
 MIN_EPOCHS_TO_INACTIVITY_PENALTY: 4
-# 2**14 (= 16,384) epochs ~73 days
-EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS: 16384
-
 
 
 # State vector lengths
@@ -146,6 +143,73 @@ DOMAIN_BEACON_ATTESTER: 0x01000000
 DOMAIN_RANDAO: 0x02000000
 DOMAIN_DEPOSIT: 0x03000000
 DOMAIN_VOLUNTARY_EXIT: 0x04000000
-DOMAIN_CUSTODY_BIT_CHALLENGE: 0x06000000
-DOMAIN_SHARD_PROPOSER: 0x80000000
-DOMAIN_SHARD_ATTESTER: 0x81000000
+# Phase 1
+DOMAIN_SHARD_PROPOSAL: 0x80000000
+DOMAIN_SHARD_COMMITTEE: 0x81000000
+DOMAIN_LIGHT_CLIENT: 0x82000000
+DOMAIN_CUSTODY_BIT_SLASHING: 0x83000000
+
+
+# Phase 1: Upgrade from Phase 0
+# ---------------------------------------------------------------
+PHASE_1_FORK_VERSION: 0x01000000
+INITIAL_ACTIVE_SHARDS: 64
+# Placeholder
+INITIAL_GASPRICE: 10
+
+
+# Phase 1: General
+# ---------------------------------------------------------------
+# 2**10` (= 1024)
+MAX_SHARDS: 1024
+# 2**3 (= 8) | online epochs | ~51 min
+ONLINE_PERIOD: 8
+# 2**7 (= 128)
+LIGHT_CLIENT_COMMITTEE_SIZE: 128
+# 2**8 (= 256) | epochs | ~27 hours
+LIGHT_CLIENT_COMMITTEE_PERIOD: 256
+# 2**8 (= 256) | epochs | ~27 hours
+SHARD_COMMITTEE_PERIOD: 256
+# 2**18 (= 262,144)
+SHARD_BLOCK_CHUNK_SIZE: 262144
+# 2**2 (= 4)
+MAX_SHARD_BLOCK_CHUNKS: 4
+# 3 * 2**16` (= 196,608)
+TARGET_SHARD_BLOCK_SIZE: 196608
+# Note: MAX_SHARD_BLOCKS_PER_ATTESTATION is derived from the list length.
+SHARD_BLOCK_OFFSETS: [1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233]
+# len(SHARD_BLOCK_OFFSETS)
+MAX_SHARD_BLOCKS_PER_ATTESTATION: 12
+# 2**14 (= 16,384) Gwei
+MAX_GASPRICE: 16384
+# 2**5 (= 32) Gwei
+MIN_GASPRICE: 32
+#  2**3 (= 8)
+GASPRICE_ADJUSTMENT_COEFFICIENT: 8
+
+
+# Phase 1: Custody Game
+# ---------------------------------------------------------------
+
+# Time parameters
+# 2**1 (= 2) epochs, 12.8 minutes
+RANDAO_PENALTY_EPOCHS: 2
+# 2**14 (= 16,384) epochs ~73 days
+EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS: 16384
+# 2**11 (= 2,048) epochs, ~9 days
+EPOCHS_PER_CUSTODY_PERIOD: 2048
+# 2**11 (= 2,048) epochs, ~9 days
+CUSTODY_PERIOD_TO_RANDAO_PADDING: 2048
+# 2**7 (= 128) epochs, ~14 hours
+MAX_REVEAL_LATENESS_DECREMENT: 128
+
+# Max operations
+# 2**8 (= 256)
+MAX_CUSTODY_KEY_REVEALS: 256
+MAX_EARLY_DERIVED_SECRET_REVEALS: 1
+MAX_CUSTODY_SLASHINGS: 1
+
+# Reward and penalty quotients
+EARLY_DERIVED_SECRET_REVEAL_SLOT_REWARD_MULTIPLE: 2
+# 2**8 (= 256)
+MINOR_REWARD_QUOTIENT: 256

configs/minimal.yaml

@@ -21,14 +21,13 @@ MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 64
 # Jan 3, 2020
 MIN_GENESIS_TIME: 1578009600
 
-#
-#
+
 # Fork Choice
 # ---------------------------------------------------------------
 # 2**1 (= 1)
 SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 2
 
-#
+
 # Validator
 # ---------------------------------------------------------------
 # [customized] process deposits more quickly, but insecure
@@ -88,18 +87,12 @@ SLOTS_PER_ETH1_VOTING_PERIOD: 16
 SLOTS_PER_HISTORICAL_ROOT: 64
 # 2**8 (= 256) epochs
 MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
-# 2**11 (= 2,048) epochs
-PERSISTENT_COMMITTEE_PERIOD: 2048
+# [customized] higher frequency of committee turnover and faster time to acceptable voluntary exit
+PERSISTENT_COMMITTEE_PERIOD: 128
 # [customized] fast catchup crosslinks
 MAX_EPOCHS_PER_CROSSLINK: 4
 # 2**2 (= 4) epochs
 MIN_EPOCHS_TO_INACTIVITY_PENALTY: 4
-# [customized] 2**12 (= 4,096) epochs
-EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS: 4096
-# 2**2 (= 4) epochs
-EPOCHS_PER_CUSTODY_PERIOD: 4
-# 2**2 (= 4) epochs
-CUSTODY_PERIOD_TO_RANDAO_PADDING: 4
 
 
 # State vector lengths
@@ -149,16 +142,75 @@ DOMAIN_BEACON_ATTESTER: 0x01000000
 DOMAIN_RANDAO: 0x02000000
 DOMAIN_DEPOSIT: 0x03000000
 DOMAIN_VOLUNTARY_EXIT: 0x04000000
-DOMAIN_CUSTODY_BIT_CHALLENGE: 0x06000000
-DOMAIN_SHARD_PROPOSER: 0x80000000
-DOMAIN_SHARD_ATTESTER: 0x81000000
+# Phase 1
+DOMAIN_SHARD_PROPOSAL: 0x80000000
+DOMAIN_SHARD_COMMITTEE: 0x81000000
+DOMAIN_LIGHT_CLIENT: 0x82000000
+DOMAIN_CUSTODY_BIT_SLASHING: 0x83000000
 
 
-# Phase 1
+# Phase 1: Upgrade from Phase 0
+# ---------------------------------------------------------------
+# [customized] for testnet distinction
+PHASE_1_FORK_VERSION: 0x01000001
+# [customized] reduced for testing
+INITIAL_ACTIVE_SHARDS: 4
+# Placeholder
+INITIAL_GASPRICE: 10
+
+
+# Phase 1: General
+# ---------------------------------------------------------------
+# [customized] reduced for testing
+MAX_SHARDS: 8
+# 2**3 (= 8) | online epochs
+ONLINE_PERIOD: 8
+# 2**7 (= 128)
+LIGHT_CLIENT_COMMITTEE_SIZE: 128
+# 2**8 (= 256) | epochs
+LIGHT_CLIENT_COMMITTEE_PERIOD: 256
+# 2**8 (= 256) | epochs
+SHARD_COMMITTEE_PERIOD: 256
+# 2**18 (= 262,144)
+SHARD_BLOCK_CHUNK_SIZE: 262144
+# 2**2 (= 4)
+MAX_SHARD_BLOCK_CHUNKS: 4
+# 3 * 2**16` (= 196,608)
+TARGET_SHARD_BLOCK_SIZE: 196608
+# Note: MAX_SHARD_BLOCKS_PER_ATTESTATION is derived from the list length.
+SHARD_BLOCK_OFFSETS: [1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233]
+# len(SHARD_BLOCK_OFFSETS)
+MAX_SHARD_BLOCKS_PER_ATTESTATION: 12
+# 2**14 (= 16,384) Gwei
+MAX_GASPRICE: 16384
+# 2**5 (= 32) Gwei
+MIN_GASPRICE: 32
+#  2**3 (= 8)
+GASPRICE_ADJUSTMENT_COEFFICIENT: 8
+
+
+# Phase 1: Custody Game
 # ---------------------------------------------------------------
-SHARD_SLOTS_PER_BEACON_SLOT: 2
-EPOCHS_PER_SHARD_PERIOD: 4
-# PHASE_1_FORK_EPOCH >= EPOCHS_PER_SHARD_PERIOD * 2
-PHASE_1_FORK_EPOCH: 8
-# PHASE_1_FORK_SLOT = PHASE_1_FORK_EPOCH * SLOTS_PER_EPOCH
-PHASE_1_FORK_SLOT: 64
+
+# Time parameters
+# 2**1 (= 2) epochs
+RANDAO_PENALTY_EPOCHS: 2
+# [customized] quicker for testing
+EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS: 4096
+# 2**11 (= 2,048) epochs
+EPOCHS_PER_CUSTODY_PERIOD: 2048
+# 2**11 (= 2,048) epochs
+CUSTODY_PERIOD_TO_RANDAO_PADDING: 2048
+# 2**7 (= 128) epochs
+MAX_REVEAL_LATENESS_DECREMENT: 128
+
+# Max operations
+# 2**8 (= 256)
+MAX_CUSTODY_KEY_REVEALS: 256
+MAX_EARLY_DERIVED_SECRET_REVEALS: 1
+MAX_CUSTODY_SLASHINGS: 1
+
+# Reward and penalty quotients
+EARLY_DERIVED_SECRET_REVEAL_SLOT_REWARD_MULTIPLE: 2
+# 2**8 (= 256)
+MINOR_REWARD_QUOTIENT: 256