Improve ENR equality logic

Author: flcl42

src/Lantern.Discv5.Enr/Base64Url.cs

@@ -27,4 +27,4 @@ public static byte[] ToBytes(string input)
         }
         return Convert.FromBase64String(sb.ToString());
     }
-}
+}

src/Lantern.Discv5.Enr/Enr.cs

@@ -1,4 +1,4 @@
-using Lantern.Discv5.Enr.Entries;
+using Lantern.Discv5.Enr.Entries;
 using Lantern.Discv5.Enr.Identity;
 using Lantern.Discv5.Rlp;
 using Multiformats.Base;
@@ -8,13 +8,14 @@ namespace Lantern.Discv5.Enr;
 
 public class Enr : IEnr, IEquatable<IEnr>
 {
-    private readonly IDictionary<string, IEntry> _entries;
+    private readonly Dictionary<string, IEntry> _entries;
     private readonly IIdentitySigner? _signer;
     private readonly IIdentityVerifier? _verifier;
     private byte[]? _cachedNodeId;
+    private int? _cachedHashCode;
 
     public Enr(
-        IDictionary<string, IEntry> initialEntries,
+        Dictionary<string, IEntry> initialEntries,
         IIdentityVerifier verifier,
         IIdentitySigner? signer = null,
         byte[]? signature = null,
@@ -51,20 +52,12 @@ public byte[] NodeId
     }
 
     public T GetEntry<T>(string key, T defaultValue = default!) where T : IEntry
-    {
-        var entry = _entries.Values.FirstOrDefault(e => e.Key == key);
-
-        return entry is T result ? result : defaultValue;
-    }
+        => _entries.TryGetValue(key, out var entry) && entry is T result ? result : defaultValue;
 
     public void UpdateEntry<T>(T value) where T : class, IEntry
     {
-        foreach (var existingKey in _entries.Where(entry => entry.Value.Key.Equals(value.Key)).ToList())
-        {
-            _entries.Remove(existingKey.Key);
-        }
-
-        _entries[value.Key] = value;
+        string key = value.Key;
+        _entries[key] = value;
         IncrementSequenceNumber();
     }
 
@@ -104,20 +97,45 @@ public bool Equals(IEnr? other)
         return other != null && NodeId.AsSpan().SequenceEqual(other.NodeId.AsSpan());
     }
 
+    public override bool Equals(object? obj)
+    {
+        return obj is IEnr other && Equals(other);
+    }
+
+    public override int GetHashCode()
+    {
+        if (_cachedHashCode.HasValue)
+            return _cachedHashCode.Value;
+
+        var nodeId = NodeId;
+        var hash = new HashCode();
+
+        foreach (var b in nodeId)
+        {
+            hash.Add(b);
+        }
+
+        _cachedHashCode = hash.ToHashCode();
+        return _cachedHashCode.Value;
+    }
+
     public override string ToString()
     {
         return $"enr:{Base64Url.ToString(EncodeRecord())}";
     }
 
     public string ToEnode()
     {
-        if (Signature == null)
-            throw new InvalidOperationException("Signature must be set before encoding.");
+        var publicKey = GetEntry<EntrySecp256K1>(EnrEntryKey.Secp256K1).Value;
+        if (publicKey == null)
+            throw new InvalidOperationException("Public key must be present in ENR for enode format.");
+
+        var publicKeyHex = Convert.ToHexString(publicKey).ToLower();
 
         if (!HasKey(EnrEntryKey.Tcp))
-            return $"enode://{Convert.ToHexString(Signature).ToLower()}@{GetEntry<EntryIp>(EnrEntryKey.Ip).Value}?discport={GetEntry<EntryUdp>(EnrEntryKey.Udp).Value}";
+            return $"enode://{publicKeyHex}@{GetEntry<EntryIp>(EnrEntryKey.Ip).Value}?discport={GetEntry<EntryUdp>(EnrEntryKey.Udp).Value}";
 
-        return $"enode://{Convert.ToHexString(Signature).ToLower()}@{GetEntry<EntryIp>(EnrEntryKey.Ip).Value}:{GetEntry<EntryTcp>(EnrEntryKey.Tcp).Value}?discport={GetEntry<EntryUdp>(EnrEntryKey.Udp).Value}";
+        return $"enode://{publicKeyHex}@{GetEntry<EntryIp>(EnrEntryKey.Ip).Value}:{GetEntry<EntryTcp>(EnrEntryKey.Tcp).Value}?discport={GetEntry<EntryUdp>(EnrEntryKey.Udp).Value}";
     }
 
     public string ToPeerId()
@@ -143,4 +161,4 @@ private byte[] EncodeEnrContent()
             .SelectMany(e => e.Value.EncodeEntry())
             .ToArray();
     }
-}
+}

src/Lantern.Discv5.Enr/EnrConstants.cs

@@ -5,4 +5,4 @@ public static class EnrConstants
     public const int EnrPrefixLength = 4;
 
     public static readonly byte[] ProtoBufferPrefix = { 0x08, 0x02, 0x12, 0x21 };
-}
+}

src/Lantern.Discv5.Enr/EnrEntryKey.cs

@@ -16,4 +16,4 @@ public record EnrEntryKey(string Value)
 
     public static implicit operator string(EnrEntryKey key) => key.Value;
     public static implicit operator EnrEntryKey(string key) => new(key);
-}
+}

src/Lantern.Discv5.Enr/EnrEntryRegistry.cs

@@ -59,4 +59,4 @@ private void RegisterDefaultEntries()
             RegisterEntry(entry.Item1, entry.Item2);
         }
     }
-}
+}

src/Lantern.Discv5.Enr/Entries/EntryAttnets.cs

@@ -14,4 +14,4 @@ public IEnumerable<byte> EncodeEntry()
         return ByteArrayUtils.JoinByteArrays(RlpEncoder.EncodeString(Key, Encoding.ASCII),
             RlpEncoder.EncodeBytes(Value));
     }
-}
+}

src/Lantern.Discv5.Enr/Entries/EntryEth2.cs

@@ -14,4 +14,4 @@ public IEnumerable<byte> EncodeEntry()
         return ByteArrayUtils.JoinByteArrays(RlpEncoder.EncodeString(Key, Encoding.ASCII),
             RlpEncoder.EncodeBytes(Value));
     }
-}
+}

src/Lantern.Discv5.Enr/Entries/EntryId.cs

@@ -14,4 +14,4 @@ public IEnumerable<byte> EncodeEntry()
         return ByteArrayUtils.JoinByteArrays(RlpEncoder.EncodeString(Key, Encoding.ASCII),
             RlpEncoder.EncodeString(Value, Encoding.ASCII));
     }
-}
+}

src/Lantern.Discv5.Enr/Entries/EntryIp.cs

@@ -15,4 +15,4 @@ public IEnumerable<byte> EncodeEntry()
         return ByteArrayUtils.JoinByteArrays(RlpEncoder.EncodeString(Key, Encoding.ASCII),
             RlpEncoder.EncodeBytes(Value.GetAddressBytes()));
     }
-}
+}

src/Lantern.Discv5.Enr/Entries/EntryIp6.cs

@@ -15,4 +15,4 @@ public IEnumerable<byte> EncodeEntry()
         return ByteArrayUtils.JoinByteArrays(RlpEncoder.EncodeString(Key, Encoding.ASCII),
             RlpEncoder.EncodeBytes(Value.GetAddressBytes()));
     }
-}
+}