Add TODO and some cleanups

Author: Bhargavasomu

eth/beacon/state_machines/validation.py

@@ -30,6 +30,7 @@ def validate_proposer_signature(state: BeaconState,
                                 epoch_length: int) -> None:
     block_without_signature_root = BaseBeaconBlock.get_block_without_signature_root(block)
 
+    # TODO: Replace this root with tree hash root
     proposal_root = ProposalSignedData(
         state.slot,
         beacon_chain_shard_number,
@@ -40,9 +41,12 @@ def validate_proposer_signature(state: BeaconState,
     beacon_proposer_index = get_beacon_proposer_index(state, state.slot, epoch_length)
     proposer_pubkey = state.validator_registry[beacon_proposer_index].pubkey
 
-    if not verify(
-            pubkey=proposer_pubkey,
-            message=proposal_root,
-            signature=block.signature,
-            domain=get_domain(state.fork_data, state.slot, SignatureDomain.DOMAIN_PROPOSAL)):
+    is_valid_signature = verify(
+        pubkey=proposer_pubkey,
+        message=proposal_root,
+        signature=block.signature,
+        domain=get_domain(state.fork_data, state.slot, SignatureDomain.DOMAIN_PROPOSAL)
+    )
+
+    if not is_valid_signature:
         raise ValidationError("Invalid Proposer Signature on block")

eth/beacon/types/blocks.py

@@ -118,12 +118,6 @@ def num_attestations(self) -> int:
     def get_block_without_signature_root(
             cls,
             block: 'BaseBeaconBlock') -> Hash32:
-        return cls(
-            slot=block.slot,
-            parent_root=block.parent_root,
-            state_root=block.state_root,
-            randao_reveal=block.randao_reveal,
-            candidate_pow_receipt_root=block.candidate_pow_receipt_root,
-            signature=EMPTY_SIGNATURE,
-            body=block.body,
+        return block.copy(
+            signature=EMPTY_SIGNATURE
         ).root

tests/beacon/state_machines/test_validation.py

@@ -4,6 +4,10 @@
     ValidationError,
 )
 
+from eth.beacon.enums import (
+    SignatureDomain,
+)
+
 from eth.beacon.state_machines.validation import (
     validate_proposer_signature,
 )
@@ -72,7 +76,7 @@ def test_validate_proposer_signature(
         signature=bls.sign(
             message=proposal_root,
             privkey=proposer_privkey,
-            domain=2,
+            domain=SignatureDomain.DOMAIN_PROPOSAL,
         ),
     )