Merge branch 'dev' into tests/merge

specs/sharding/beacon-chain.md

@@ -270,8 +270,6 @@ class ShardBlobBody(Container):
     degree_proof: BLSCommitment
     # The actual data. Should match the commitment and degree proof.
     data: List[BLSPoint, POINTS_PER_SAMPLE * MAX_SAMPLES_PER_BLOB]
-    # Latest block root of the Beacon Chain, before shard_blob.slot
-    beacon_block_root: Root
     # fee payment fields (EIP 1559 like)
     # TODO: express in MWei instead?
     max_priority_fee_per_sample: Gwei
@@ -293,8 +291,6 @@ class ShardBlobBodySummary(Container):
     degree_proof: BLSCommitment
     # Hash-tree-root as summary of the data field
     data_root: Root
-    # Latest block root of the Beacon Chain, before shard_blob.slot
-    beacon_block_root: Root
     # fee payment fields (EIP 1559 like)
     # TODO: express in MWei instead?
     max_priority_fee_per_sample: Gwei
@@ -695,10 +691,6 @@ def process_shard_header(state: BeaconState, signed_header: SignedShardBlobHeade
     committees_per_slot = get_committee_count_per_slot(state, header_epoch)
     assert committee_index <= committees_per_slot
 
-    # Verify that the block root matches,
-    # to ensure the header will only be included in this specific Beacon Chain sub-tree.
-    assert header.body_summary.beacon_block_root == get_block_root_at_slot(state, slot - 1)
-
     # Check that this data is still pending
     committee_work = state.shard_buffer[slot % SHARD_STATE_MEMORY_SLOTS][shard]
     assert committee_work.status.selector == SHARD_WORK_PENDING

specs/sharding/p2p-interface.md

@@ -98,7 +98,7 @@ on the horizontal subnet or creating samples for it. Alias `blob = signed_blob.m
 - _[REJECT]_ The blob signature, `signed_blob.signature`, is valid for the aggregate of proposer and builder --
   i.e. `bls.FastAggregateVerify([builder_pubkey, proposer_pubkey], blob_signing_root, signed_blob.signature)`.
 - _[REJECT]_ The blob is proposed by the expected `proposer_index` for the blob's `slot` and `shard`,
-  in the context of the current shuffling (defined by `blob.body.beacon_block_root`/`slot`).
+  in the context of the current shuffling (defined by the current node head state and `blob.slot`).
   If the `proposer_index` cannot immediately be verified against the expected shuffling,
   the blob MAY be queued for later processing while proposers for the blob's branch are calculated --
   in such a case _do not_ `REJECT`, instead `IGNORE` this message.
@@ -133,7 +133,7 @@ The following validations MUST pass before forwarding the `signed_blob_header` o
 - _[REJECT]_ The header signature, `signed_blob_header.signature`, is valid for the aggregate of proposer and builder --
   i.e. `bls.FastAggregateVerify([builder_pubkey, proposer_pubkey], blob_signing_root, signed_blob_header.signature)`.
 - _[REJECT]_ The header is proposed by the expected `proposer_index` for the blob's `header.slot` and `header.shard`
-  in the context of the current shuffling (defined by `header.body_summary.beacon_block_root`/`slot`).
+  in the context of the current shuffling (defined by the current node head state and `header.slot`).
   If the `proposer_index` cannot immediately be verified against the expected shuffling,
   the blob MAY be queued for later processing while proposers for the blob's branch are calculated --
   in such a case _do not_ `REJECT`, instead `IGNORE` this message.
@@ -161,7 +161,7 @@ The following validations MUST pass before forwarding the `signed_blob_header` o
 - _[REJECT]_ The header signature, `signed_blob_header.signature`, is valid for ONLY the builder --
   i.e. `bls.Verify(builder_pubkey, blob_signing_root, signed_blob_header.signature)`. The signature is not an aggregate with the proposer.
 - _[REJECT]_ The header is designated for proposal by the expected `proposer_index` for the blob's `header.slot` and `header.shard`
-  in the context of the current shuffling (defined by `header.body_summary.beacon_block_root`/`slot`).
+  in the context of the current shuffling (defined by the current node head state and `header.slot`).
   If the `proposer_index` cannot immediately be verified against the expected shuffling,
   the blob MAY be queued for later processing while proposers for the blob's branch are calculated --
   in such a case _do not_ `REJECT`, instead `IGNORE` this message.

tests/core/pyspec/eth2spec/test/altair/unittests/test_helpers.py

@@ -9,9 +9,6 @@ from eth2spec.test.helpers.merkle import build_proof
 @with_phases([ALTAIR])
 @spec_state_test
 def test_next_sync_committee_tree(spec, state):
-    state.next_sync_committee: object = spec.SyncCommittee(
-        pubkeys=[state.validators[i]for i in range(spec.SYNC_COMMITTEE_SIZE)]
-    )
     next_sync_committee_branch = build_proof(state.get_backing(), spec.NEXT_SYNC_COMMITTEE_INDEX)
     assert spec.is_valid_merkle_branch(
         leaf=state.next_sync_committee.hash_tree_root(),

tests/generators/bls/main.py

@@ -45,8 +45,8 @@ MESSAGES = [
 SAMPLE_MESSAGE = b'\x12' * 32
 
 PRIVKEYS = [
-    # Curve order is 256 so private keys are 32 bytes at most.
-    # Also not all integers is a valid private key, so using pre-generated keys
+    # Curve order is 256, so private keys use 32 bytes at most.
+    # Also, not all integers are valid private keys. Therefore, using pre-generated keys.
     hex_to_int('0x00000000000000000000000000000000263dbd792f5b1be47ed85f8938c0f29586af0d3ac7b977f21c278fe1462040e3'),
     hex_to_int('0x0000000000000000000000000000000047b8192d77bf871b62e87859d653922725724a5c031afeabc60bcef5ff665138'),
     hex_to_int('0x00000000000000000000000000000000328388aff0d4a5b7dc9205abd374e7e98f3cd9f3418edb4eafda5fb16473d216'),