Fix convertPublicKeyToNodeId

zilm13 · Sep 24, 2024 · 507ff36 · 507ff36
1 parent d198746
commit 507ff36
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/.../src/main/java/tech/pegasys/teku/networking/p2p/discovery/discv5/NodeRecordConverter.java b/.../src/main/java/tech/pegasys/teku/networking/p2p/discovery/discv5/NodeRecordConverter.java
@@ -23,9 +23,11 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.schema.EnrField;
+import org.ethereum.beacon.discovery.schema.IdentitySchema;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
-import org.ethereum.beacon.discovery.schema.NodeRecordBuilder;
+import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
 import tech.pegasys.teku.infrastructure.ssz.collections.SszBitvector;
 import tech.pegasys.teku.infrastructure.ssz.schema.collections.SszBitvectorSchema;
 import tech.pegasys.teku.networking.p2p.discovery.DiscoveryPeer;
@@ -36,7 +38,13 @@ public class NodeRecordConverter {
   private static final Logger LOG = LogManager.getLogger();
 
   public Bytes convertPublicKeyToNodeId(final Bytes publicKey) {
-    return new NodeRecordBuilder().publicKey(publicKey).build().getNodeId();
+    // TODO need to open an additional API in discovery instead of this hack
+    NodeRecord tempNodeRecord =
+        NodeRecordFactory.DEFAULT.createFromValues(
+            UInt64.ZERO,
+            new EnrField(EnrField.PKEY_SECP256K1, publicKey),
+            new EnrField(EnrField.ID, IdentitySchema.V4));
+    return tempNodeRecord.getNodeId();
   }
 
   public Optional<DiscoveryPeer> convertToDiscoveryPeer(