Merge branch 'dev' into vbuterin-patch-7

ethereum · Mar 6, 2019 · 2f6e560 · 2f6e560
2 parents b4779cd + 28f2a72
commit 2f6e560
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 388 deletions.
diff --git a/specs/core/0_beacon-chain.md b/specs/core/0_beacon-chain.md
@@ -1324,7 +1324,7 @@ def process_deposit(state: BeaconState, deposit: Deposit) -> None:
     # Verify the proof of possession
     proof_is_valid = bls_verify(
         pubkey=deposit_input.pubkey,
-        message_hash=signed_root(deposit_input, "proof_of_possession"),
+        message_hash=signed_root(deposit_input),
         signature=deposit_input.proof_of_possession,
         domain=get_domain(
             state.fork,
@@ -1717,7 +1717,7 @@ def process_block_header(state: BeaconState, block: BeaconBlock) -> None:
     proposer = state.validator_registry[get_beacon_proposer_index(state, state.slot)]
     assert bls_verify(
         pubkey=proposer.pubkey,
-        message_hash=signed_root(block, "signature"),
+        message_hash=signed_root(block),
         signature=block.signature,
         domain=get_domain(state.fork, get_current_epoch(state), DOMAIN_BEACON_BLOCK)
     )
@@ -1781,7 +1781,7 @@ def process_proposer_slashing(state: BeaconState,
     for header in (proposer_slashing.header_1, proposer_slashing.header_2):
         assert bls_verify(
             pubkey=proposer.pubkey,
-            message_hash=signed_root(header, "signature"),
+            message_hash=signed_root(header),
             signature=header.signature,
             domain=get_domain(state.fork, slot_to_epoch(header.slot), DOMAIN_BEACON_BLOCK)
         )
@@ -1933,7 +1933,7 @@ def process_exit(state: BeaconState, exit: VoluntaryExit) -> None:
     # Verify signature
     assert bls_verify(
         pubkey=validator.pubkey,
-        message_hash=signed_root(exit, "signature"),
+        message_hash=signed_root(exit),
         signature=exit.signature,
         domain=get_domain(state.fork, exit.epoch, DOMAIN_VOLUNTARY_EXIT)
     )
@@ -1978,7 +1978,7 @@ def process_transfer(state: BeaconState, transfer: Transfer) -> None:
     # Verify that the signature is valid
     assert bls_verify(
         pubkey=transfer.pubkey,
-        message_hash=signed_root(transfer, "signature"),
+        message_hash=signed_root(transfer),
         signature=transfer.signature,
         domain=get_domain(state.fork, slot_to_epoch(transfer.slot), DOMAIN_TRANSFER)
     )