Merge branch 'dev' into generators-workflow

test_generators/operations/deposits.py

@@ -46,7 +46,7 @@ def build_deposit(state,
 
     deposit_data = build_deposit_data(state, pubkey, withdrawal_cred, privkey, amount)
 
-    item = spec.hash(deposit_data.serialize())
+    item = deposit_data.hash_tree_root()
     index = len(deposit_data_leaves)
     deposit_data_leaves.append(item)
     tree = calc_merkle_tree_from_leaves(tuple(deposit_data_leaves))
@@ -69,7 +69,7 @@ def build_deposit_for_index(initial_validator_count: int, index: int) -> Tuple[s
     )
     state = genesis.create_genesis_state(genesis_deposits)
 
-    deposit_data_leaves = [spec.hash(dep.data.serialize()) for dep in genesis_deposits]
+    deposit_data_leaves = [dep.data.hash_tree_root() for dep in genesis_deposits]
 
     deposit = build_deposit(
         state,

test_generators/operations/genesis.py

@@ -4,7 +4,7 @@ from typing import List
 
 
 def create_genesis_state(deposits: List[spec.Deposit]) -> spec.BeaconState:
-    deposit_root = get_merkle_root((tuple([spec.hash(dep.data.serialize()) for dep in deposits])))
+    deposit_root = get_merkle_root((tuple([(dep.data.hash_tree_root()) for dep in deposits])))
 
     return spec.get_genesis_beacon_state(
         deposits,
@@ -32,7 +32,7 @@ def create_deposits(pubkeys: List[spec.BLSPubkey], withdrawal_cred: List[spec.By
     ]
 
     # Fill tree with existing deposits
-    deposit_data_leaves = [spec.hash(data.serialize()) for data in deposit_data]
+    deposit_data_leaves = [data.hash_tree_root() for data in deposit_data]
     tree = calc_merkle_tree_from_leaves(tuple(deposit_data_leaves))
 
     return [

test_generators/ssz_static/README.md

@@ -2,3 +2,5 @@
 
 The purpose of this test-generator is to provide test-vectors for the most important applications of SSZ:
  the serialization and hashing of ETH 2.0 data types
+
+Test-format documentation can be found [here](../../specs/test_formats/ssz_static/README.md).

test_generators/ssz_static/main.py

@@ -2,7 +2,11 @@ from random import Random
 
 from eth2spec.debug import random_value, encode
 from eth2spec.phase0 import spec
-from eth2spec.utils.minimal_ssz import hash_tree_root, serialize
+from eth2spec.utils.minimal_ssz import (
+    hash_tree_root,
+    signing_root,
+    serialize,
+)
 from eth_utils import (
     to_tuple, to_dict
 )
@@ -21,6 +25,8 @@ def create_test_case(rng: Random, name: str, mode: random_value.RandomizationMod
     yield "value", encode.encode(value, typ)
     yield "serialized", '0x' + serialize(value).hex()
     yield "root", '0x' + hash_tree_root(value).hex()
+    if hasattr(value, "signature"):
+        yield "signing_root", '0x' + signing_root(value).hex()
 
 
 @to_tuple