Merge pull request #2808 from ethereum/receipts-root

receipt_root -> receipts_root

specs/bellatrix/beacon-chain.md

@@ -169,7 +169,7 @@ class ExecutionPayload(Container):
     parent_hash: Hash32
     fee_recipient: ExecutionAddress  # 'beneficiary' in the yellow paper
     state_root: Bytes32
-    receipt_root: Bytes32  # 'receipts root' in the yellow paper
+    receipts_root: Bytes32
     logs_bloom: ByteVector[BYTES_PER_LOGS_BLOOM]
     random: Bytes32  # 'difficulty' in the yellow paper
     block_number: uint64  # 'number' in the yellow paper
@@ -191,7 +191,7 @@ class ExecutionPayloadHeader(Container):
     parent_hash: Hash32
     fee_recipient: ExecutionAddress
     state_root: Bytes32
-    receipt_root: Bytes32
+    receipts_root: Bytes32
     logs_bloom: ByteVector[BYTES_PER_LOGS_BLOOM]
     random: Bytes32
     block_number: uint64
@@ -359,7 +359,7 @@ def process_execution_payload(state: BeaconState, payload: ExecutionPayload, exe
         parent_hash=payload.parent_hash,
         fee_recipient=payload.fee_recipient,
         state_root=payload.state_root,
-        receipt_root=payload.receipt_root,
+        receipts_root=payload.receipts_root,
         logs_bloom=payload.logs_bloom,
         random=payload.random,
         block_number=payload.block_number,

tests/core/pyspec/eth2spec/test/helpers/execution_payload.py

@@ -13,7 +13,7 @@ def build_empty_execution_payload(spec, state, randao_mix=None):
         parent_hash=latest.block_hash,
         fee_recipient=spec.ExecutionAddress(),
         state_root=latest.state_root,  # no changes to the state
-        receipt_root=b"no receipts here" + b"\x00" * 16,  # TODO: root of empty MPT may be better.
+        receipts_root=b"no receipts here" + b"\x00" * 16,  # TODO: root of empty MPT may be better.
         logs_bloom=spec.ByteVector[spec.BYTES_PER_LOGS_BLOOM](),  # TODO: zeroed logs bloom for empty logs ok?
         block_number=latest.block_number + 1,
         random=randao_mix,
@@ -36,7 +36,7 @@ def get_execution_payload_header(spec, execution_payload):
         parent_hash=execution_payload.parent_hash,
         fee_recipient=execution_payload.fee_recipient,
         state_root=execution_payload.state_root,
-        receipt_root=execution_payload.receipt_root,
+        receipts_root=execution_payload.receipts_root,
         logs_bloom=execution_payload.logs_bloom,
         random=execution_payload.random,
         block_number=execution_payload.block_number,

tests/core/pyspec/eth2spec/test/helpers/genesis.py

@@ -28,7 +28,7 @@ def get_sample_genesis_execution_payload_header(spec,
         parent_hash=b'\x30' * 32,
         fee_recipient=b'\x42' * 20,
         state_root=b'\x20' * 32,
-        receipt_root=b'\x20' * 32,
+        receipts_root=b'\x20' * 32,
         logs_bloom=b'\x35' * spec.BYTES_PER_LOGS_BLOOM,
         random=eth1_block_hash,
         block_number=0,