use v1.6.1 consensus reference tests (#7737)

* use v1.6.1 consensus reference tests

* complete update

---------

Co-authored-by: Caleb <[email protected]>

Author: tersec

ConsensusSpecPreset-mainnet.md

@@ -3810,6 +3810,7 @@ ConsensusSpecPreset-mainnet
 + [Invalid] EF - Gloas - Operations - Execution Payload - invalid_future_timestamp_regular_p OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - invalid_past_timestamp_first_paylo OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - invalid_past_timestamp_regular_pay OK
++ [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_bid_prev OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_executio OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_invalid_ OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_wrong_be OK
@@ -3854,6 +3855,7 @@ ConsensusSpecPreset-mainnet
 + [Invalid] EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK
 + [Invalid] EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK
 + [Invalid] EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK
++ [Invalid] EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK
 + [Valid]   EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK
 + [Valid]   EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK
 + [Valid]   EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK

ConsensusSpecPreset-minimal.md

@@ -4064,6 +4064,7 @@ ConsensusSpecPreset-minimal
 + [Invalid] EF - Gloas - Operations - Execution Payload - invalid_future_timestamp_regular_p OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - invalid_past_timestamp_first_paylo OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - invalid_past_timestamp_regular_pay OK
++ [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_bid_prev OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_executio OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_invalid_ OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_wrong_be OK
@@ -4108,6 +4109,7 @@ ConsensusSpecPreset-minimal
 + [Invalid] EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK
 + [Invalid] EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK
 + [Invalid] EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK
++ [Invalid] EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK
 + [Valid]   EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK
 + [Valid]   EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK
 + [Valid]   EF - Gloas - Operations - Execution Payload Bid - process_execution_payload_bid_ OK

beacon_chain/spec/beaconstate.nim

@@ -2550,7 +2550,7 @@ func upgrade_to_next*(
     proposer_lookahead: initialize_proposer_lookahead(pre, cache)
   )
 
-# https://github.com/ethereum/consensus-specs/blob/v1.6.0-beta.0/specs/gloas/fork.md#upgrading-the-state
+# https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/gloas/fork.md#upgrading-the-state
 # upgrade_to_gloas
 func upgrade_to_next*(
     cfg: RuntimeConfig, pre: fulu.BeaconState, _: var StateCache): gloas.BeaconState =
@@ -2612,7 +2612,9 @@ func upgrade_to_next*(
     next_sync_committee: pre.next_sync_committee,
 
     # [Modified in Gloas:EIP7732]
-    latest_execution_payload_bid: gloas.ExecutionPayloadBid(),
+    latest_execution_payload_bid: gloas.ExecutionPayloadBid(
+      block_hash: pre.latest_execution_payload_header.block_hash
+    ),
     next_withdrawal_index: pre.next_withdrawal_index,
     next_withdrawal_validator_index: pre.next_withdrawal_validator_index,
     historical_summaries: pre.historical_summaries,

beacon_chain/spec/datatypes/base.nim

@@ -80,7 +80,7 @@ export
   eth_types_json_serialization.writeValue
 
 # https://github.com/ethereum/consensus-specs/releases
-const SPEC_VERSION* = "1.6.0"
+const SPEC_VERSION* = "1.6.1"
 ## Spec version we're aiming to be compatible with, right now
 
 const

beacon_chain/spec/datatypes/gloas.nim

@@ -74,17 +74,18 @@ type
     blobsBundle*: fulu.BlobsBundle # [New in Fulu]
     executionRequests*: seq[seq[byte]]
 
-  # https://github.com/ethereum/consensus-specs/blob/v1.6.0-beta.0/specs/gloas/beacon-chain.md#executionpayloadbid
+  # https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/gloas/beacon-chain.md#executionpayloadbid
   ExecutionPayloadBid* = object
-    # Execution block header fields
     parent_block_hash*: Eth2Digest
     parent_block_root*: Eth2Digest
     block_hash*: Eth2Digest
+    prev_randao*: Eth2Digest
     fee_recipient*: ExecutionAddress
     gas_limit*: uint64
     builder_index*: uint64
     slot*: Slot
     value*: Gwei
+    execution_payment*: Gwei
     blob_kzg_commitments_root*: Eth2Digest
 
   # https://github.com/ethereum/consensus-specs/blob/v1.6.0-beta.0/specs/gloas/beacon-chain.md#signedexecutionpayloadbid

beacon_chain/spec/state_transition_block.nim

@@ -1124,7 +1124,7 @@ proc process_execution_payload*(
 
   ok()
 
-# https://github.com/ethereum/consensus-specs/blob/v1.6.0-beta.0/specs/gloas/beacon-chain.md#new-process_execution_payload
+# https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/gloas/beacon-chain.md#new-process_execution_payload
 proc process_execution_payload*(
     cfg: RuntimeConfig, state: var gloas.HashedBeaconState,
     signed_envelope: SignedExecutionPayloadEnvelope,
@@ -1163,6 +1163,8 @@ proc process_execution_payload*(
   if committed_bid.blob_kzg_commitments_root !=
       hash_tree_root(envelope.blob_kzg_commitments):
     return err("process_execution_payload: blob KZG commitments root mismatch")
+  if not(committed_bid.prev_randao == payload.prev_randao):
+    return err("process_execution_payload: prev_randao mismatch")
 
   # Verify the withdrawals root
   if hash_tree_root(payload.withdrawals) != state.data.latest_withdrawals_root:
@@ -1180,11 +1182,6 @@ proc process_execution_payload*(
   if payload.parent_hash != state.data.latest_block_hash:
     return err("process_execution_payload: parent hash mismatch")
 
-  # Verify prev_randao
-  if payload.prev_randao !=
-      get_randao_mix(state.data, get_current_epoch(state.data)):
-    return err("process_execution_payload: prev_randao mismatch")
-
   # Verify timestamp
   if payload.timestamp != cfg.timeParams
       .compute_timestamp_at_slot(state.data, state.data.slot):

beacon_chain/spec/state_transition_epoch.nim

@@ -1601,7 +1601,7 @@ proc process_epoch*(
 
   ok()
 
-# https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.6/specs/gloas/beacon-chain.md#modified-process_epoch
+# https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/gloas/beacon-chain.md#modified-process_epoch
 proc process_epoch*(
     cfg: RuntimeConfig, state: var gloas.BeaconState,
     flags: UpdateFlags, cache: var StateCache, info: var altair.EpochInfo):
@@ -1628,6 +1628,7 @@ proc process_epoch*(
   process_slashings(state, info.balances.current_epoch)
   process_eth1_data_reset(state)
   ? process_pending_deposits(cfg, state, cache)
+  ? process_builder_pending_payments(cfg, state, cache)  # [New in Gloas:EIP7732]
   ? process_pending_consolidations(cfg, state)
   process_effective_balance_updates(state)
   process_slashings_reset(state)
@@ -1636,6 +1637,5 @@ proc process_epoch*(
   process_participation_flag_updates(state)
   process_sync_committee_updates(state)
   ? process_proposer_lookahead(state, cache)
-  ? process_builder_pending_payments(cfg, state, cache)  # [New in Gloas:EIP7732]
 
   ok()

tests/consensus_spec/gloas/test_fixture_operations.nim

@@ -219,20 +219,9 @@ suite baseDescription & "Execution Payload " & preset():
       res
 
   for path in walkTests(OpExecutionPayloadDir):
-    let
-      testDir = OpExecutionPayloadDir / "pyspec_tests" / path
-      inputFile =
-        if fileExists(testDir/"signed_envelope.ssz_snappy"):
-          "signed_envelope"
-        # Skip test vectors with missing signed envelope files
-        # will be fixed in next consensus-spec-tests release
-        # https://github.com/ethereum/consensus-specs/issues/4545
-        else:
-          continue
-
     let applyExecutionPayload = makeApplyExecutionPayloadCb(path)
     runTest[SignedExecutionPayloadEnvelope, typeof applyExecutionPayload](
-      OpExecutionPayloadDir, suiteName, "Execution Payload", inputFile,
+      OpExecutionPayloadDir, suiteName, "Execution Payload", "signed_envelope",
       applyExecutionPayload, path)
 
 suite baseDescription & "Execution Payload Bid " & preset():

tests/consensus_spec/test_fixture_fork_choice.nim

@@ -270,7 +270,7 @@ proc stepOnBlock(
 
   let blockAdded = dag.addHeadBlock(verifier, signedBlock) do (
       blckRef: BlockRef, signedBlock: consensusFork.TrustedSignedBeaconBlock,
-      state: consensusFork.Beaconstate,
+      state: consensusFork.BeaconState,
       epochRef: EpochRef, unrealized: FinalityCheckpoints):
 
     # 4. Update fork choice if valid