changes

Author: StefanBratanov

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/gloas/execution/ExecutionPayloadProcessorGloas.java

@@ -37,7 +37,6 @@
 import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionRequestsDataCodec;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.MutableBeaconState;
-import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.gloas.BeaconStateGloas;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.gloas.MutableBeaconStateGloas;
 import tech.pegasys.teku.spec.datastructures.state.versions.gloas.BuilderPendingPayment;
 import tech.pegasys.teku.spec.datastructures.type.SszKZGCommitment;
@@ -100,13 +99,9 @@ private boolean verifyExecutionPayloadEnvelopeSignature(
     final BLSPublicKey pubkey;
     if (builderIndex.equals(BUILDER_INDEX_SELF_BUILD)) {
       final UInt64 validatorIndex = preState.getLatestBlockHeader().getProposerIndex();
-      pubkey = preState.getValidators().get(validatorIndex.intValue()).getPublicKey();
+      pubkey = beaconStateAccessors.getValidatorPubKey(preState, validatorIndex).orElseThrow();
     } else {
-      pubkey =
-          BeaconStateGloas.required(preState)
-              .getBuilders()
-              .get(builderIndex.intValue())
-              .getPublicKey();
+      pubkey = beaconStateAccessors.getBuilderPubKey(preState, builderIndex).orElseThrow();
     }
     final Bytes32 domain =
         beaconStateAccessors.getDomain(

ethereum/spec/src/test/java/tech/pegasys/teku/spec/logic/versions/gloas/helpers/BeaconStateAccessorsGloasTest.java

@@ -17,9 +17,13 @@
 
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
+import tech.pegasys.teku.bls.BLSPublicKey;
+import tech.pegasys.teku.infrastructure.ssz.SszList;
+import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
+import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconStateCache;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.gloas.BeaconStateGloas;
 import tech.pegasys.teku.spec.datastructures.state.versions.gloas.Builder;
 import tech.pegasys.teku.spec.util.DataStructureUtil;
@@ -34,9 +38,10 @@ public class BeaconStateAccessorsGloasTest {
   @Test
   void getBuilderIndex_shouldReturnBuilderIndex() {
     final BeaconStateGloas state = BeaconStateGloas.required(dataStructureUtil.randomBeaconState());
-    assertThat(state.getBuilders()).hasSizeGreaterThan(5);
-    for (int i = 0; i < 5; i++) {
-      final Builder builder = state.getBuilders().get(i);
+    final SszList<Builder> builders = state.getBuilders();
+    assertThat(builders).isNotEmpty();
+    for (int i = 0; i < builders.size(); i++) {
+      final Builder builder = builders.get(i);
       assertThat(beaconStateAccessors.getBuilderIndex(state, builder.getPublicKey())).contains(i);
     }
   }
@@ -48,4 +53,31 @@ public void getBuilderIndex_shouldReturnEmptyWhenBuilderNotFound() {
         beaconStateAccessors.getBuilderIndex(state, dataStructureUtil.randomPublicKey());
     assertThat(index).isEmpty();
   }
+
+  @Test
+  public void getBuilderPubKey_shouldReturnBuilderPubKey() {
+    final BeaconStateGloas state = BeaconStateGloas.required(dataStructureUtil.randomBeaconState());
+    final SszList<Builder> builders = state.getBuilders();
+    assertThat(builders).isNotEmpty();
+    for (int i = 0; i < builders.size(); i++) {
+      final Builder builder = builders.get(i);
+      final UInt64 builderIndex = UInt64.valueOf(i);
+      assertThat(beaconStateAccessors.getBuilderPubKey(state, builderIndex))
+          .contains(builder.getPublicKey());
+      // pubKey => builderIndex mapping is pre cached
+      assertThat(
+              BeaconStateCache.getTransitionCaches(state)
+                  .getBuildersPubKeys()
+                  .getCached(builderIndex))
+          .isPresent();
+    }
+  }
+
+  @Test
+  public void getBuilderPubKey_shouldReturnEmptyWhenBuilderNotExisting() {
+    final BeaconState state = dataStructureUtil.randomBeaconState();
+    final Optional<BLSPublicKey> index =
+        beaconStateAccessors.getBuilderPubKey(state, UInt64.valueOf(999));
+    assertThat(index).isEmpty();
+  }
 }

ethereum/spec/src/test/java/tech/pegasys/teku/spec/logic/versions/gloas/helpers/MiscHelpersGloasTest.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright Consensys Software Inc., 2026
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package tech.pegasys.teku.spec.logic.versions.gloas.helpers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+import tech.pegasys.teku.infrastructure.unsigned.UInt64;
+import tech.pegasys.teku.spec.Spec;
+import tech.pegasys.teku.spec.TestSpecFactory;
+
+public class MiscHelpersGloasTest {
+
+  private final Spec spec = TestSpecFactory.createMinimalGloas();
+
+  private final MiscHelpersGloas miscHelpers =
+      MiscHelpersGloas.required(spec.getGenesisSpec().miscHelpers());
+
+  @Test
+  public void roundTrip_convertBetweenBuilderIndexAndValidatorIndex() {
+    final UInt64 builderIndex = UInt64.valueOf(42);
+    final UInt64 validatorIndex = miscHelpers.convertBuilderIndexToValidatorIndex(builderIndex);
+    assertThat(miscHelpers.convertValidatorIndexToBuilderIndex(validatorIndex))
+        .isEqualTo(builderIndex);
+  }
+}