Small fixes pre-release (#10044)

Author: lucassaldanha

gradle/versions.gradle

@@ -64,7 +64,7 @@ dependencyManagement {
       entry 'oshi-core-java11'
     }
 
-    dependencySet(group: 'io.netty', version: '4.2.5.Final') {
+    dependencySet(group: 'io.netty', version: '4.2.7.Final') {
       entry 'netty-handler'
       entry 'netty-codec-http'
     }

networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/peers/DataColumnSidecarSignatureValidator.java

@@ -16,7 +16,6 @@
 import java.util.Optional;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
-import tech.pegasys.teku.bls.BLSSignatureVerifier;
 import tech.pegasys.teku.infrastructure.async.SafeFuture;
 import tech.pegasys.teku.infrastructure.collections.cache.LRUCache;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
@@ -31,18 +30,13 @@
 public class DataColumnSidecarSignatureValidator {
   private final Spec spec;
   private final CombinedChainDataClient chainDataClient;
-  private final BLSSignatureVerifier signatureVerifier;
-
   private final LRUCache<Bytes32, SafeFuture<Boolean>>
       cachedSignatureValidationResultsBySignedHeaderRoot;
 
   public DataColumnSidecarSignatureValidator(
-      final Spec spec,
-      final CombinedChainDataClient chainDataClient,
-      final BLSSignatureVerifier signatureVerifier) {
+      final Spec spec, final CombinedChainDataClient chainDataClient) {
     this.spec = spec;
     this.chainDataClient = chainDataClient;
-    this.signatureVerifier = signatureVerifier;
 
     // let's cache enough headers so that we can be effective even during syncing,
     // when we try to download columns for multiple blocks in parallel
@@ -83,8 +77,9 @@ public SafeFuture<Boolean> validateSignature(final DataColumnSidecar sidecar) {
                     return spec.getValidatorPubKey(state, proposerIndex)
                         .map(
                             pubKey ->
-                                signatureVerifier.verify(
-                                    pubKey, signingRoot, signedBlockHeader.getSignature()))
+                                spec.getSpecConfig(epoch)
+                                    .getBLSSignatureVerifier()
+                                    .verify(pubKey, signingRoot, signedBlockHeader.getSignature()))
                         .orElse(false);
                   });
         });

networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/peers/Eth2PeerFactory.java

@@ -15,7 +15,6 @@
 
 import java.util.Optional;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
-import tech.pegasys.teku.bls.BLSSignatureVerifier;
 import tech.pegasys.teku.infrastructure.time.TimeProvider;
 import tech.pegasys.teku.networking.eth2.rpc.beaconchain.BeaconChainMethods;
 import tech.pegasys.teku.networking.eth2.rpc.beaconchain.methods.MetadataMessagesFactory;
@@ -65,7 +64,7 @@ public Eth2PeerFactory(
     this.peerRequestLimit = peerRequestLimit;
     this.discoveryNodeIdExtractor = discoveryNodeIdExtractor;
     this.dataColumnSidecarSignatureValidator =
-        new DataColumnSidecarSignatureValidator(spec, chainDataClient, BLSSignatureVerifier.SIMPLE);
+        new DataColumnSidecarSignatureValidator(spec, chainDataClient);
   }
 
   public Eth2Peer create(final Peer peer, final BeaconChainMethods rpcMethods) {

networking/eth2/src/test/java/tech/pegasys/teku/networking/eth2/peers/DataColumnSidecarSignatureValidatorTest.java

@@ -14,6 +14,7 @@
 package tech.pegasys.teku.networking.eth2.peers;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -34,6 +35,7 @@
 import tech.pegasys.teku.spec.ForkSchedule;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
+import tech.pegasys.teku.spec.config.SpecConfig;
 import tech.pegasys.teku.spec.constants.Domain;
 import tech.pegasys.teku.spec.datastructures.blobs.DataColumnSidecar;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlockHeader;
@@ -44,6 +46,7 @@
 
 public class DataColumnSidecarSignatureValidatorTest {
   private final Spec spec = Mockito.mock(Spec.class);
+  private final SpecConfig specConfig = mock(SpecConfig.class);
   private final DataStructureUtil dataStructureUtil =
       new DataStructureUtil(TestSpecFactory.createMinimalFulu());
 
@@ -68,7 +71,7 @@ dataStructureUtil.new RandomDataColumnSidecarBuilder()
           .build();
 
   private final DataColumnSidecarSignatureValidator validator =
-      new DataColumnSidecarSignatureValidator(spec, chainDataClient, signatureVerifier);
+      new DataColumnSidecarSignatureValidator(spec, chainDataClient);
 
   @BeforeEach
   void setUp() {
@@ -87,6 +90,8 @@ void setUp() {
     when(spec.computeSigningRoot(signedBeaconBlockHeader.getMessage(), domain))
         .thenReturn(signingRoot);
 
+    when(spec.getSpecConfig(any())).thenReturn(specConfig);
+    when(specConfig.getBLSSignatureVerifier()).thenReturn(signatureVerifier);
     // valid by default
     when(signatureVerifier.verify(
             proposerPubKey, signingRoot, signedBeaconBlockHeader.getSignature()))