roll back gloas-specific changes while keeping the fork

Author: tersec

AllTests-mainnet.md

@@ -612,13 +612,6 @@ AllTests-mainnet
 + Roundtrip engine RPC V2 and capella ExecutionPayload representations                       OK
 + Roundtrip engine RPC V3 and deneb ExecutionPayload representations                         OK
 ```
-## Envelope Quarantine
-```diff
-+ Add missing                                                                                OK
-+ Add orphan                                                                                 OK
-+ Clean up orphans                                                                           OK
-+ Pop orphan                                                                                 OK
-```
 ## Eth1 monitor
 ```diff
 + Rewrite URLs                                                                               OK
@@ -889,16 +882,6 @@ AllTests-mainnet
 ```diff
 + pre-1.1.0                                                                                  OK
 ```
-## Payload attestation pool [Preset: mainnet]
-```diff
-+ Can add and retrieve payload attestations [Preset: mainnet]                                OK
-+ Can get payload attestations for block production [Preset: mainnet]                        OK
-+ Different payload presence values [Preset: mainnet]                                        OK
-+ Duplicate validator in PTC - multiple signatures [Preset: mainnet]                         OK
-+ Multiple validators in PTC can attest [Preset: mainnet]                                    OK
-+ Payload attestations get pruned [Preset: mainnet]                                          OK
-+ get_ptc with ShufflingRef matches StateCache version [Preset: mainnet]                     OK
-```
 ## PeerPool testing suite
 ```diff
 + Access peers by key test                                                                   OK

ConsensusSpecPreset-mainnet.md

@@ -559,15 +559,14 @@ type
     finalized_checkpoint*: Checkpoint
 
     # Inactivity
-    inactivity_scores*: InactivityScores
+    inactivity_scores*: HashList[uint64, Limit VALIDATOR_REGISTRY_LIMIT]
 
     # Light client sync committees
     current_sync_committee*: SyncCommittee
     next_sync_committee*: SyncCommittee
 
     # Execution
-    latest_execution_payload_bid*: gloas.ExecutionPayloadBid
-      ## [Modified in Gloas:EIP7732]
+    latest_execution_payload_header*: deneb.ExecutionPayloadHeader
 
     # Withdrawals
     next_withdrawal_index*: WithdrawalIndex
@@ -591,25 +590,8 @@ type
       HashList[PendingPartialWithdrawal, Limit PENDING_PARTIAL_WITHDRAWALS_LIMIT]
     pending_consolidations*:
       HashList[PendingConsolidation, Limit PENDING_CONSOLIDATIONS_LIMIT]
+      ## [New in Electra:EIP7251]
 
     # [New in Fulu:EIP7917]
     proposer_lookahead*:
         HashArray[Limit ((MIN_SEED_LOOKAHEAD + 1) * SLOTS_PER_EPOCH), uint64]
-
-    # [New in Gloas:EIP7732]
-    builders*: HashList[Builder, Limit BUILDER_REGISTRY_LIMIT]
-    # [New in Gloas:EIP7732]
-    next_withdrawal_builder_index*: uint64
-    # [New in Gloas:EIP7732]
-    execution_payload_availability*: BitArray[int(SLOTS_PER_HISTORICAL_ROOT)]
-    # [New in Gloas:EIP7732]
-    builder_pending_payments*:
-      HashArray[Limit 2 * SLOTS_PER_EPOCH, BuilderPendingPayment]
-    # [New in Gloas:EIP7732]
-    builder_pending_withdrawals*:
-      HashList[BuilderPendingWithdrawal, Limit BUILDER_PENDING_WITHDRAWALS_LIMIT]
-    # [New in Gloas:EIP7732]
-    latest_block_hash*: Eth2Digest
-    # [New in Gloas:EIP7732]
-    payload_expected_withdrawals*:
-      HashList[Withdrawal, Limit MAX_WITHDRAWALS_PER_PAYLOAD]

ConsensusSpecPreset-minimal.md

@@ -83,25 +83,12 @@ func init*(
           capella.SomeBeaconBlock | capella.TrustedBeaconBlock |
           deneb.SomeBeaconBlock | deneb.TrustedBeaconBlock |
           electra.SomeBeaconBlock | electra.TrustedBeaconBlock |
-          fulu.SomeBeaconBlock | fulu.TrustedBeaconBlock): BlockRef =
+          fulu.SomeBeaconBlock | fulu.TrustedBeaconBlock |
+          gloas.SomeBeaconBlock | gloas.TrustedBeaconBlock): BlockRef =
   BlockRef.init(
     root, Opt.some blck.body.execution_payload.block_hash, optimisticStatus, blck.slot
   )
 
-func init*(
-    T: type BlockRef, root: Eth2Digest, optimisticStatus: OptimisticStatus,
-    blck: gloas.SomeBeaconBlock | gloas.TrustedBeaconBlock): BlockRef =
-  BlockRef.init(
-    root,
-    Opt.some blck.body.signed_execution_payload_bid.message.block_hash,
-    if optimisticStatus == OptimisticStatus.valid or
-        blck.body.signed_execution_payload_bid.message.block_hash.isZero:
-      OptimisticStatus.valid
-    else:
-      optimisticStatus,
-    blck.slot,
-  )
-
 func parent*(bs: BlockSlot): BlockSlot =
   ## Return a blockslot representing the previous slot, using the parent block
   ## if the current slot had a block

beacon_chain/beacon_chain_db_immutable.nim

@@ -2283,9 +2283,7 @@ proc loadExecutionBlockHash*(dag: ChainDAGRef, bid: BlockId): Opt[Eth2Digest] =
     return Opt.none(Eth2Digest)
 
   withBlck(blockData):
-    when consensusFork >= ConsensusFork.Gloas:
-      Opt.some forkyBlck.message.body.signed_execution_payload_bid.message.block_hash
-    elif consensusFork >= ConsensusFork.Bellatrix:
+    when consensusFork >= ConsensusFork.Bellatrix:
       Opt.some forkyBlck.message.body.execution_payload.block_hash
     else:
       Opt.some ZERO_HASH

beacon_chain/consensus_object_pools/block_dag.nim

@@ -17,7 +17,7 @@ import
   ../spec/[helpers, forks],
   ../consensus_object_pools/[
     attestation_pool, blob_quarantine, block_clearance, block_quarantine,
-    blockchain_dag, envelope_quarantine, execution_payload_pool,
+    blockchain_dag, execution_payload_pool,
     payload_attestation_pool, light_client_pool,
     sync_committee_msg_pool, validator_change_pool],
   ../validators/validator_pool,
@@ -174,8 +174,6 @@ type
 
     dataColumnQuarantine*: ref ColumnQuarantine
 
-    envelopeQuarantine*: ref EnvelopeQuarantine
-
     # Application-provided current time provider (to facilitate testing)
     getCurrentBeaconTime*: GetBeaconTimeFn
 
@@ -318,37 +316,6 @@ proc processSignedBeaconBlock*(
 
   ok()
 
-proc processExecutionPayloadEnvelope*(
-    self: var Eth2Processor, src: MsgSource,
-    signedEnvelope: SignedExecutionPayloadEnvelope): ValidationRes =
-  let
-    wallTime = self.getCurrentBeaconTime()
-    (afterGenesis, wallSlot) = wallTime.toSlot(self.dag.timeParams)
-
-  logScope:
-    blockRoot = shortLog(signedEnvelope.message.beacon_block_root)
-    envelope = shortLog(signedEnvelope.message)
-    wallSlot
-
-  if not afterGenesis:
-    notice "Execution payload envelope before genesis"
-    return errIgnore("Execution payload envelope before genesis")
-
-  let delay = wallTime -
-    signedEnvelope.message.slot.start_beacon_time(self.dag.timeParams)
-
-  self.dag.validateExecutionPayload(
-      self.quarantine, self.envelopeQuarantine, signedEnvelope).isOkOr:
-    execution_payload_envelopes_dropped.inc(1, [$error[0]])
-    return err(error)
-
-  debugGloasComment("process execution payload")
-
-  execution_payload_envelopes_received.inc()
-  execution_payload_envelope_delay.observe(delay.toFloatSeconds())
-
-  ok()
-
 proc processBlobSidecar*(
     self: var Eth2Processor, src: MsgSource,
     blobSidecar: deneb.BlobSidecar, subnet_id: BlobId): ValidationRes =
@@ -550,7 +517,7 @@ proc processAttestation*(
     return errIgnore("Attestation before genesis")
 
   # Potential under/overflows are fine; would just create odd metrics and logs
-  let 
+  let
     consensusFork =
       self.dag.cfg.consensusForkAtEpoch(attestation.data.slot.epoch)
     delay = wallTime - attestation.data.slot.attestation_deadline(