From 85b6c4d93f214ccb483ceef6254745b742aaa7c5 Mon Sep 17 00:00:00 2001
From: dapplion <35266934+dapplion@users.noreply.github.com>
Date: Tue, 28 Apr 2026 14:03:00 +0200
Subject: [PATCH] Fix post_beacon_pool_payload_attestations_valid for Gloas
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR #9178 added this Gloas-only test using ApiTester::new() which
produces a phase0 chain even under FORK_NAME=gloas, so
head.beacon_state.get_ptc(...) errored with IncorrectStateVariant.
After switching to new_with_hard_forks() three further issues
surfaced:

1. The slot clock is left at head_slot + 1 by the harness setup, so
   a payload attestation for head_slot fails gossip propagation as a
   PastSlot. Rewind the clock to head_slot in
   make_valid_payload_attestation_message.

2. With VALIDATOR_COUNT = 32 and 32 slots/epoch, a slot's committees
   often hold only a single validator. The PTC for that slot then
   has one distinct validator regardless of PTCSize. The original
   test chained JSON and SSZ sub-tests on the same harness with
   ptc_offset 0 and 1 and asserted both gossip-published, but the
   second message is a duplicate (same slot/validator) and is
   silently dropped as PriorPayloadAttestationMessageKnown — so the
   second recv() hangs forever. Split the SSZ variant into its own
   test with its own harness so the two don't collide in the
   ObservedPayloadAttesters cache.

3. Switching the JSON test to new_with_hard_forks() so the chain
   actually reaches Gloas under FORK_NAME=gloas (same fix as the
   sibling tests added in #8415 and #9100).

Verified locally: full Gloas suite 197/197 passed (350s).
---
 beacon_node/http_api/tests/tests.rs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/beacon_node/http_api/tests/tests.rs b/beacon_node/http_api/tests/tests.rs
index b4301bacff..4ac34fcea8 100644
--- a/beacon_node/http_api/tests/tests.rs
+++ b/beacon_node/http_api/tests/tests.rs
@@ -2803,6 +2803,12 @@ impl ApiTester {
         let fork = head.beacon_state.fork();
         let genesis_validators_root = self.chain.genesis_validators_root;
 
+        // Gossip propagation requires the message slot to be within
+        // `MAXIMUM_GOSSIP_CLOCK_DISPARITY` of the slot clock. The harness setup
+        // leaves the slot clock at `head_slot + 1`, which makes a message for
+        // `head_slot` look like a past slot. Rewind the clock to the head slot.
+        self.chain.slot_clock.set_slot(head_slot.as_u64());
+
         let ptc = head
             .beacon_state
             .get_ptc(head_slot, &self.chain.spec)
@@ -8339,9 +8345,22 @@ async fn post_beacon_pool_payload_attestations_valid() {
     if !fork_name_from_env().is_some_and(|f| f.gloas_enabled()) {
         return;
     }
-    ApiTester::new()
+    ApiTester::new_with_hard_forks()
         .await
         .test_post_beacon_pool_payload_attestations_valid()
+        .await;
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn post_beacon_pool_payload_attestations_valid_ssz() {
+    if !fork_name_from_env().is_some_and(|f| f.gloas_enabled()) {
+        return;
+    }
+    // Use a separate harness from the JSON variant so that the SSZ sub-test does
+    // not collide with the JSON sub-test in the gossip dedup cache (with the
+    // small `VALIDATOR_COUNT` used by these tests, the slot's PTC may hold only
+    // one distinct validator, making the second message a duplicate).
+    ApiTester::new_with_hard_forks()
         .await
         .test_post_beacon_pool_payload_attestations_valid_ssz()
         .await;