Fix get_new_validator_registry_delta_chain_tip

Author: hwwhww

eth/beacon/helpers.py

@@ -27,12 +27,9 @@
     clamp,
 )
 
-from eth.beacon.block_committees_info import (
-    BlockCommitteesInfo,
-)
-from eth.beacon.types.shard_committees import (
-    ShardCommittee,
-)
+from eth.beacon.block_committees_info import BlockCommitteesInfo
+from eth.beacon.types.shard_committees import ShardCommittee
+from eth.beacon.types.validator_registry_delta_block import ValidatorRegistryDeltaBlock
 from eth.beacon._utils.random import (
     shuffle,
     split,
@@ -364,19 +361,19 @@ def get_effective_balance(validator: 'ValidatorRecord', max_deposit: int) -> int
 
 
 def get_new_validator_registry_delta_chain_tip(current_validator_registry_delta_chain_tip: Hash32,
-                                               index: int,
+                                               validator_index: int,
                                                pubkey: int,
                                                flag: int) -> Hash32:
     """
     Compute the next hash in the validator registry delta hash chain.
     """
-    return hash_eth2(
-        current_validator_registry_delta_chain_tip +
-        flag.to_bytes(1, 'big') +
-        index.to_bytes(3, 'big') +
-        # TODO: currently, we use 256-bit pubkey which is different form the spec
-        pubkey.to_bytes(32, 'big')
-    )
+    # TODO: switch to SSZ tree hashing
+    return ValidatorRegistryDeltaBlock(
+        latest_registry_delta_root=current_validator_registry_delta_chain_tip,
+        validator_index=validator_index,
+        pubkey=pubkey,
+        flag=flag,
+    ).root
 
 
 def get_fork_version(fork_data: 'ForkData',

eth/beacon/types/deposit_input.py

@@ -14,7 +14,7 @@
     hash32,
     uint384,
 )
-from eth.beacon.utils.hash import hash_eth2
+from eth.beacon._utils.hash import hash_eth2
 
 
 class DepositInput(rlp.Serializable):

tests/beacon/test_helpers.py

@@ -467,10 +467,12 @@ def mock_get_shard_committees_at_slot(state,
 
 
 def test_get_active_validator_indices(sample_validator_record_params):
-    # 3 validators are ACTIVE by default.
+    # 3 validators are ACTIVE
     validators = [
         ValidatorRecord(
             **sample_validator_record_params,
+        ).copy(
+            status=ValidatorStatusCode.ACTIVE,
         )
         for i in range(3)
     ]
@@ -613,7 +615,7 @@ def test_get_effective_balance(balance, max_deposit, expected, sample_validator_
 
 @pytest.mark.parametrize(
     (
-        'index,'
+        'validator_index,'
         'pubkey,'
         'flag,'
         'expected'
@@ -623,17 +625,17 @@ def test_get_effective_balance(balance, max_deposit, expected, sample_validator_
             1,
             2 * 256 - 1,
             1,
-            b'\xe8\xaaH\x14\xa3\xban\x8f^rn1\xdf\xfd\xe1\xed\xe9S*\x80\xf5\xe3\x03\x983\x15\xd1\x91t\xcc\xb4h'  # noqa: E501
+            b'\xb8K\xad[zDE\xef\x00Z\x9c\x04\xdc\x95\xff\x9c\xeaP\x15\xf5\xfb\xdd\x0f\x1c:\xd7U+\x81\x92:\xee'  # noqa: E501
         ),
     ]
 )
-def test_get_new_validator_registry_delta_chain_tip(index,
+def test_get_new_validator_registry_delta_chain_tip(validator_index,
                                                     pubkey,
                                                     flag,
                                                     expected):
     result = get_new_validator_registry_delta_chain_tip(
         current_validator_registry_delta_chain_tip=ZERO_HASH32,
-        index=index,
+        validator_index=validator_index,
         pubkey=pubkey,
         flag=flag,
     )