Remove the IL bitlist from bid

Author: jihoonsong

specs/_features/eip8148/beacon-chain.md

@@ -122,8 +122,6 @@ class BeaconState(Container):
     execution_payload_availability: Bitvector[SLOTS_PER_HISTORICAL_ROOT]
     builder_pending_payments: Vector[BuilderPendingPayment, 2 * SLOTS_PER_EPOCH]
     builder_pending_withdrawals: List[BuilderPendingWithdrawal, BUILDER_PENDING_WITHDRAWALS_LIMIT]
-    # [Modified in Heze:EIP7805]
-    latest_execution_payload_bid: ExecutionPayloadBid
     payload_expected_withdrawals: List[Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD]
     ptc_window: Vector[Vector[ValidatorIndex, PTC_SIZE], (2 + MIN_SEED_LOOKAHEAD) * SLOTS_PER_EPOCH]
     # [New in EIP8148]

specs/heze/beacon-chain.md

@@ -14,8 +14,6 @@
     - [`InclusionList`](#inclusionlist)
     - [`SignedInclusionList`](#signedinclusionlist)
   - [Modified containers](#modified-containers)
-    - [`ExecutionPayloadBid`](#executionpayloadbid)
-    - [`SignedExecutionPayloadBid`](#signedexecutionpayloadbid)
     - [`BeaconState`](#beaconstate)
 - [Helpers](#helpers)
   - [Predicates](#predicates)
@@ -70,90 +68,6 @@ class SignedInclusionList(Container):
     signature: BLSSignature
 ```
 
-### Modified containers
-
-#### `ExecutionPayloadBid`
-
-```python
-class ExecutionPayloadBid(Container):
-    parent_block_hash: Hash32
-    parent_block_root: Root
-    block_hash: Hash32
-    prev_randao: Bytes32
-    fee_recipient: ExecutionAddress
-    gas_limit: uint64
-    builder_index: BuilderIndex
-    slot: Slot
-    value: Gwei
-    execution_payment: Gwei
-    blob_kzg_commitments: List[KZGCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK]
-    execution_requests_root: Root
-    # [New in Heze:EIP7805]
-    inclusion_list_bits: Bitvector[INCLUSION_LIST_COMMITTEE_SIZE]
-```
-
-#### `SignedExecutionPayloadBid`
-
-```python
-class SignedExecutionPayloadBid(Container):
-    # [Modified in Heze:EIP7805]
-    message: ExecutionPayloadBid
-    signature: BLSSignature
-```
-
-#### `BeaconState`
-
-```python
-class BeaconState(Container):
-    genesis_time: uint64
-    genesis_validators_root: Root
-    slot: Slot
-    fork: Fork
-    latest_block_header: BeaconBlockHeader
-    block_roots: Vector[Root, SLOTS_PER_HISTORICAL_ROOT]
-    state_roots: Vector[Root, SLOTS_PER_HISTORICAL_ROOT]
-    historical_roots: List[Root, HISTORICAL_ROOTS_LIMIT]
-    eth1_data: Eth1Data
-    eth1_data_votes: List[Eth1Data, EPOCHS_PER_ETH1_VOTING_PERIOD * SLOTS_PER_EPOCH]
-    eth1_deposit_index: uint64
-    validators: List[Validator, VALIDATOR_REGISTRY_LIMIT]
-    balances: List[Gwei, VALIDATOR_REGISTRY_LIMIT]
-    randao_mixes: Vector[Bytes32, EPOCHS_PER_HISTORICAL_VECTOR]
-    slashings: Vector[Gwei, EPOCHS_PER_SLASHINGS_VECTOR]
-    previous_epoch_participation: List[ParticipationFlags, VALIDATOR_REGISTRY_LIMIT]
-    current_epoch_participation: List[ParticipationFlags, VALIDATOR_REGISTRY_LIMIT]
-    justification_bits: Bitvector[JUSTIFICATION_BITS_LENGTH]
-    previous_justified_checkpoint: Checkpoint
-    current_justified_checkpoint: Checkpoint
-    finalized_checkpoint: Checkpoint
-    inactivity_scores: List[uint64, VALIDATOR_REGISTRY_LIMIT]
-    current_sync_committee: SyncCommittee
-    next_sync_committee: SyncCommittee
-    latest_block_hash: Hash32
-    next_withdrawal_index: WithdrawalIndex
-    next_withdrawal_validator_index: ValidatorIndex
-    historical_summaries: List[HistoricalSummary, HISTORICAL_ROOTS_LIMIT]
-    deposit_requests_start_index: uint64
-    deposit_balance_to_consume: Gwei
-    exit_balance_to_consume: Gwei
-    earliest_exit_epoch: Epoch
-    consolidation_balance_to_consume: Gwei
-    earliest_consolidation_epoch: Epoch
-    pending_deposits: List[PendingDeposit, PENDING_DEPOSITS_LIMIT]
-    pending_partial_withdrawals: List[PendingPartialWithdrawal, PENDING_PARTIAL_WITHDRAWALS_LIMIT]
-    pending_consolidations: List[PendingConsolidation, PENDING_CONSOLIDATIONS_LIMIT]
-    proposer_lookahead: Vector[ValidatorIndex, (MIN_SEED_LOOKAHEAD + 1) * SLOTS_PER_EPOCH]
-    builders: List[Builder, BUILDER_REGISTRY_LIMIT]
-    next_withdrawal_builder_index: BuilderIndex
-    execution_payload_availability: Bitvector[SLOTS_PER_HISTORICAL_ROOT]
-    builder_pending_payments: Vector[BuilderPendingPayment, 2 * SLOTS_PER_EPOCH]
-    builder_pending_withdrawals: List[BuilderPendingWithdrawal, BUILDER_PENDING_WITHDRAWALS_LIMIT]
-    # [Modified in Heze:EIP7805]
-    latest_execution_payload_bid: ExecutionPayloadBid
-    payload_expected_withdrawals: List[Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD]
-    ptc_window: Vector[Vector[ValidatorIndex, PTC_SIZE], (2 + MIN_SEED_LOOKAHEAD) * SLOTS_PER_EPOCH]
-```
-
 ## Helpers
 
 ### Predicates

specs/heze/builder.md

@@ -35,22 +35,6 @@ change is made to upgrade to Heze.
 ```python
 def upgrade_to_heze(pre: gloas.BeaconState) -> BeaconState:
     epoch = gloas.get_current_epoch(pre)
-    latest_execution_payload_bid = ExecutionPayloadBid(
-        parent_block_hash=pre.latest_execution_payload_bid.parent_block_hash,
-        parent_block_root=pre.latest_execution_payload_bid.parent_block_root,
-        block_hash=pre.latest_execution_payload_bid.block_hash,
-        prev_randao=pre.latest_execution_payload_bid.prev_randao,
-        fee_recipient=pre.latest_execution_payload_bid.fee_recipient,
-        gas_limit=pre.latest_execution_payload_bid.gas_limit,
-        builder_index=pre.latest_execution_payload_bid.builder_index,
-        slot=pre.latest_execution_payload_bid.slot,
-        value=pre.latest_execution_payload_bid.value,
-        execution_payment=pre.latest_execution_payload_bid.execution_payment,
-        blob_kzg_commitments=pre.latest_execution_payload_bid.blob_kzg_commitments,
-        execution_requests_root=pre.latest_execution_payload_bid.execution_requests_root,
-        # [New in Heze:EIP7805]
-        inclusion_list_bits=Bitvector[INCLUSION_LIST_COMMITTEE_SIZE](),
-    )
 
     post = BeaconState(
         genesis_time=pre.genesis_time,
@@ -101,8 +85,7 @@ def upgrade_to_heze(pre: gloas.BeaconState) -> BeaconState:
         execution_payload_availability=pre.execution_payload_availability,
         builder_pending_payments=pre.builder_pending_payments,
         builder_pending_withdrawals=pre.builder_pending_withdrawals,
-        # [Modified in Heze:EIP7805]
-        latest_execution_payload_bid=latest_execution_payload_bid,
+        latest_execution_payload_bid=pre.latest_execution_payload_bid,
         payload_expected_withdrawals=pre.payload_expected_withdrawals,
         ptc_window=pre.ptc_window,
     )

specs/heze/fork.md

@@ -12,8 +12,6 @@
   - [New `get_inclusion_list_store`](#new-get_inclusion_list_store)
   - [New `process_inclusion_list`](#new-process_inclusion_list)
   - [New `get_inclusion_list_transactions`](#new-get_inclusion_list_transactions)
-  - [New `get_inclusion_list_bits`](#new-get_inclusion_list_bits)
-  - [New `is_inclusion_list_bits_inclusive`](#new-is_inclusion_list_bits_inclusive)
 
 <!-- mdformat-toc end -->
 
@@ -115,56 +113,3 @@ def get_inclusion_list_transactions(
     # Deduplicate inclusion list transactions. Order does not need to be preserved.
     return list(set(transactions))
 ```
-
-### New `get_inclusion_list_bits`
-
-```python
-def get_inclusion_list_bits(
-    store: InclusionListStore, state: BeaconState, slot: Slot, only_timely: bool = True
-) -> Bitvector[INCLUSION_LIST_COMMITTEE_SIZE]:
-    """
-    Return a ``Bitvector`` over inclusion list committee indices with bits set
-    for valid and non-equivocating inclusion list submissions for the given ``slot``.
-    """
-    committee = get_inclusion_list_committee(state, slot)
-    key = hash_tree_root(committee)
-
-    inclusion_lists = store.inclusion_lists[key]
-    equivocators = store.equivocators[key]
-    timeliness = store.inclusion_list_timeliness
-
-    validator_indices = [
-        inclusion_lists[inclusion_list_root].validator_index
-        for inclusion_list_root in inclusion_lists
-        if inclusion_lists[inclusion_list_root].validator_index not in equivocators
-        if not only_timely or timeliness[inclusion_list_root]
-    ]
-
-    return Bitvector[INCLUSION_LIST_COMMITTEE_SIZE](
-        validator_index in validator_indices for validator_index in committee
-    )
-```
-
-### New `is_inclusion_list_bits_inclusive`
-
-```python
-def is_inclusion_list_bits_inclusive(
-    store: InclusionListStore,
-    state: BeaconState,
-    slot: Slot,
-    inclusion_list_bits: Bitvector[INCLUSION_LIST_COMMITTEE_SIZE],
-    only_timely: bool = True,
-) -> bool:
-    """
-    Return ``True`` if and only if ``inclusion_list_bits`` is a superset of
-    the locally observed inclusion list bits for the given ``slot``.
-    """
-    local_inclusion_list_bits = get_inclusion_list_bits(store, state, slot, only_timely)
-
-    return all(
-        inclusion_bit or not local_inclusion_bit
-        for inclusion_bit, local_inclusion_bit in zip(
-            inclusion_list_bits, local_inclusion_list_bits, strict=True
-        )
-    )
-```

specs/heze/inclusion-list.md

@@ -17,7 +17,6 @@
     - [Lookahead](#lookahead)
   - [Block and sidecar proposal](#block-and-sidecar-proposal)
     - [Constructing the `BeaconBlockBody`](#constructing-the-beaconblockbody)
-      - [Signed execution payload bid](#signed-execution-payload-bid)
       - [ExecutionPayload](#executionpayload)
   - [Inclusion list proposal](#inclusion-list-proposal)
     - [Constructing the `SignedInclusionList`](#constructing-the-signedinclusionlist)
@@ -108,16 +107,6 @@ list committee slot.
 
 #### Constructing the `BeaconBlockBody`
 
-##### Signed execution payload bid
-
-*Note*: The only change made to `signed_execution_payload_bid` is to require
-that `bid.inclusion_list_bits` must satisfy `is_inclusion_list_bits_inclusive()`
-with respect to the proposer's inclusion list view, which comprises all valid
-and non-equivocating inclusion lists they have observed.
-
-- The `bid.inclusion_list_bits` must satisfy
-  `is_inclusion_list_bits_inclusive(get_inclusion_list_store(), state, slot - 1, bid.inclusion_list_bits, only_timely=False)`.
-
 ##### ExecutionPayload
 
 `prepare_execution_payload` is updated from the Gloas specification to provide

specs/heze/validator.md

@@ -1,5 +1,4 @@
 from eth_consensus_specs.test.context import expect_assertion_error
-from eth_consensus_specs.test.helpers.forks import is_post_heze
 from eth_consensus_specs.test.helpers.keys import builder_privkeys
 
 
@@ -37,7 +36,6 @@ def prepare_signed_execution_payload_bid(
     block_hash=None,
     blob_kzg_commitments=None,
     prev_randao=None,
-    inclusion_list_bits=None,
     valid_signature=True,
     valid_amount=True,
 ):
@@ -95,9 +93,6 @@ def prepare_signed_execution_payload_bid(
         "value": value,
         "blob_kzg_commitments": blob_kzg_commitments,
     }
-    if is_post_heze(spec) and inclusion_list_bits is not None:
-        bid_kwargs["inclusion_list_bits"] = inclusion_list_bits
-
     bid = spec.ExecutionPayloadBid(**bid_kwargs)
 
     if valid_signature: