Merge pull request #1703 from ethereum/hwwhww/signed_pattern

Rework shard block and fraud proof (shard state transition) spec
ethereum · May 4, 2020 · 71dc744 · 71dc744
2 parents 4b4fc32 + 7a77018
commit 71dc744
Show file tree

Hide file tree

Showing 19 changed files with 838 additions and 347 deletions.
diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml
@@ -161,6 +161,8 @@ DOMAIN_CUSTODY_BIT_SLASHING: 0x83000000
 # Phase 1: Upgrade from Phase 0
 # ---------------------------------------------------------------
 PHASE_1_FORK_VERSION: 0x01000000
+# [STUB]
+PHASE_1_GENESIS_SLOT: 32
 INITIAL_ACTIVE_SHARDS: 64
 
 # Phase 1: General

diff --git a/configs/minimal.yaml b/configs/minimal.yaml
@@ -162,6 +162,8 @@ DOMAIN_CUSTODY_BIT_SLASHING: 0x83000000
 # ---------------------------------------------------------------
 # [customized] for testnet distinction
 PHASE_1_FORK_VERSION: 0x01000001
+# [customized] for testing
+PHASE_1_GENESIS_SLOT: 8
 # [customized] reduced for testing
 INITIAL_ACTIVE_SHARDS: 4
 

diff --git a/setup.py b/setup.py
@@ -375,7 +375,7 @@ def finalize_options(self):
                     specs/phase0/fork-choice.md
                     specs/phase1/custody-game.md
                     specs/phase1/beacon-chain.md
-                    specs/phase1/fraud-proofs.md
+                    specs/phase1/shard-transition.md
                     specs/phase1/fork-choice.md
                     specs/phase1/phase1-fork.md
                 """