Option to run Discovery V4 and V5 on the same port

src/Nethermind/Directory.Packages.props

@@ -60,7 +60,7 @@
     <PackageVersion Include="NUnit.Analyzers" Version="3.9.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="Open.NAT.Core" Version="2.1.0.5" />
-    <PackageVersion Include="PierTwo.Lantern.Discv5.WireProtocol" Version="1.0.0-preview.3" />
+    <PackageVersion Include="PierTwo.Lantern.Discv5.WireProtocol" Version="1.0.0-preview.4" />
     <PackageVersion Include="Polly" Version="8.4.1" />
     <PackageVersion Include="prometheus-net.AspNetCore" Version="8.2.1" />
     <PackageVersion Include="Pyroscope" Version="0.8.14" />

src/Nethermind/Nethermind.Api/IApiWithNetwork.cs

@@ -16,8 +16,6 @@
 using Nethermind.Synchronization;
 using Nethermind.Synchronization.Peers;
 using Nethermind.Sockets;
-using Nethermind.Synchronization.Blocks;
-using Nethermind.Synchronization.SnapSync;
 
 namespace Nethermind.Api
 {
@@ -27,7 +25,6 @@ public interface IApiWithNetwork : IApiWithBlockchain
 
         IDisconnectsAnalyzer? DisconnectsAnalyzer { get; set; }
         IDiscoveryApp? DiscoveryApp { get; set; }
-        IDiscoveryApp? DiscoveryV5App { get; set; }
         IGrpcServer? GrpcServer { get; set; }
         IIPResolver? IpResolver { get; set; }
         IMessageSerializationService MessageSerializationService { get; }

src/Nethermind/Nethermind.Api/NethermindApi.cs

@@ -127,7 +127,6 @@ public IBlockchainBridge CreateBlockchainBridge()
         public IDbFactory? DbFactory { get; set; }
         public IDisconnectsAnalyzer? DisconnectsAnalyzer { get; set; }
         public IDiscoveryApp? DiscoveryApp { get; set; }
-        public IDiscoveryApp? DiscoveryV5App { get; set; }
         public ISigner? EngineSigner { get; set; }
         public ISignerStore? EngineSignerStore { get; set; }
         public IEnode? Enode { get; set; }

src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs

@@ -19,10 +19,6 @@
 using Nethermind.Network.Config;
 using Nethermind.Network.Contract.P2P;
 using Nethermind.Network.Discovery;
-using Nethermind.Network.Discovery.Lifecycle;
-using Nethermind.Network.Discovery.Messages;
-using Nethermind.Network.Discovery.RoutingTable;
-using Nethermind.Network.Discovery.Serializers;
 using Nethermind.Network.Dns;
 using Nethermind.Network.Enr;
 using Nethermind.Network.P2P.Analyzers;
@@ -64,7 +60,6 @@ public static long Estimate(uint arenaCount, int arenaOrder)
     typeof(InitializeBlockchain))]
 public class InitializeNetwork : IStep
 {
-    private const string DiscoveryNodesDbPath = "discoveryNodes";
     private const string PeersDbPath = "peers";
 
     protected readonly IApiWithNetwork _api;
@@ -266,8 +261,7 @@ private Task StartDiscovery()
         }
 
         if (_logger.IsDebug) _logger.Debug("Starting discovery process.");
-        _api.DiscoveryApp.Start();
-        _api.DiscoveryV5App?.Start();
+        _ = _api.DiscoveryApp.StartAsync();
         if (_logger.IsDebug) _logger.Debug("Discovery process started.");
         return Task.CompletedTask;
     }
@@ -304,104 +298,12 @@ private void InitDiscovery()
             return;
         }
 
-        IDiscoveryConfig discoveryConfig = _api.Config<IDiscoveryConfig>();
-
         SameKeyGenerator privateKeyProvider = new(_api.NodeKey.Unprotect());
-        NodeIdResolver nodeIdResolver = new(_api.EthereumEcdsa);
-
-        if (discoveryConfig.Discv5Enabled)
-        {
-            SimpleFilePublicKeyDb discv5DiscoveryDb = new(
-                "EnrDiscoveryDB",
-                DiscoveryNodesDbPath.GetApplicationResourcePath(_api.Config<IInitConfig>().BaseDbPath),
-                _api.LogManager);
-
-            _api.DiscoveryApp = new DiscoveryV5App(privateKeyProvider, _api, _networkConfig, discoveryConfig, discv5DiscoveryDb, _api.LogManager);
-            _api.DiscoveryApp.Initialize(_api.NodeKey.PublicKey);
-            return;
-        }
-
-        NodeRecord selfNodeRecord = PrepareNodeRecord(privateKeyProvider);
-        IDiscoveryMsgSerializersProvider msgSerializersProvider = new DiscoveryMsgSerializersProvider(
-            _api.MessageSerializationService,
-            _api.EthereumEcdsa,
-            privateKeyProvider,
-            nodeIdResolver);
-
-        msgSerializersProvider.RegisterDiscoverySerializers();
-
-        NodeDistanceCalculator nodeDistanceCalculator = new(discoveryConfig);
-
-        NodeTable nodeTable = new(nodeDistanceCalculator, discoveryConfig, _networkConfig, _api.LogManager);
-        EvictionManager evictionManager = new(nodeTable, _api.LogManager);
-
-        NodeLifecycleManagerFactory nodeLifeCycleFactory = new(
-            nodeTable,
-            evictionManager,
-            _api.NodeStatsManager,
-            selfNodeRecord,
-            discoveryConfig,
-            _api.Timestamper,
-            _api.LogManager);
-
-        // ToDo: DiscoveryDB is registered outside dbProvider - bad
-        SimpleFilePublicKeyDb discoveryDb = new(
-            "DiscoveryDB",
-            DiscoveryNodesDbPath.GetApplicationResourcePath(_api.Config<IInitConfig>().BaseDbPath),
-            _api.LogManager);
-
-        NetworkStorage discoveryStorage = new(
-            discoveryDb,
-            _api.LogManager);
-
-        DiscoveryManager discoveryManager = new(
-            nodeLifeCycleFactory,
-            nodeTable,
-            discoveryStorage,
-            discoveryConfig,
-            _api.LogManager
-        );
-
-        NodesLocator nodesLocator = new(
-            nodeTable,
-            discoveryManager,
-            discoveryConfig,
-            _api.LogManager);
-
-        _api.DiscoveryApp = new DiscoveryApp(
-            nodesLocator,
-            discoveryManager,
-            nodeTable,
-            _api.MessageSerializationService,
-            _api.CryptoRandom,
-            discoveryStorage,
-            _networkConfig,
-            discoveryConfig,
-            _api.Timestamper,
-            _api.LogManager);
 
+        _api.DiscoveryApp = new CompositeDiscoveryApp(_api, _logger, privateKeyProvider);
         _api.DiscoveryApp.Initialize(_api.NodeKey.PublicKey);
     }
 
-    private NodeRecord PrepareNodeRecord(SameKeyGenerator privateKeyProvider)
-    {
-        NodeRecord selfNodeRecord = new();
-        selfNodeRecord.SetEntry(IdEntry.Instance);
-        selfNodeRecord.SetEntry(new IpEntry(_api.IpResolver!.ExternalIp));
-        selfNodeRecord.SetEntry(new TcpEntry(_networkConfig.P2PPort));
-        selfNodeRecord.SetEntry(new UdpEntry(_networkConfig.DiscoveryPort));
-        selfNodeRecord.SetEntry(new Secp256K1Entry(_api.NodeKey!.CompressedPublicKey));
-        selfNodeRecord.EnrSequence = 1;
-        NodeRecordSigner enrSigner = new(_api.EthereumEcdsa, privateKeyProvider.Generate());
-        enrSigner.Sign(selfNodeRecord);
-        if (!enrSigner.Verify(selfNodeRecord))
-        {
-            throw new NetworkingException("Self ENR initialization failed", NetworkExceptionType.Discovery);
-        }
-
-        return selfNodeRecord;
-    }
-
     private Task StartSync()
     {
         if (_api.SyncPeerPool is null) throw new StepDependencyException(nameof(_api.SyncPeerPool));
@@ -522,7 +424,7 @@ private async Task InitPeer()
             _api.BackgroundTaskScheduler,
             _api.TxPool,
             pooledTxsRequestor,
-            _api.DiscoveryApp!,
+            _api.DiscoveryApp,
             _api.MessageSerializationService,
             _api.RlpxPeer,
             _api.NodeStatsManager,
@@ -555,9 +457,7 @@ private async Task InitPeer()
             _api.DisposeStack.Push(new NodeSourceToDiscV4Feeder(enrDiscovery, _api.DiscoveryApp, 50));
         }
 
-        CompositeNodeSource nodeSources = _api.DiscoveryV5App is null
-          ? new(_api.StaticNodesManager, nodesLoader, enrDiscovery, _api.DiscoveryApp)
-          : new(_api.StaticNodesManager, nodesLoader, enrDiscovery, _api.DiscoveryApp, _api.DiscoveryV5App);
+        CompositeNodeSource nodeSources = new(_api.StaticNodesManager, nodesLoader, enrDiscovery, _api.DiscoveryApp);
         _api.PeerPool = new PeerPool(nodeSources, _api.NodeStatsManager, peerStorage, _networkConfig, _api.LogManager);
         _api.PeerManager = new PeerManager(
             _api.RlpxPeer,

src/Nethermind/Nethermind.Network.Discovery.Test/NettyDiscoveryHandlerTests.cs

@@ -2,9 +2,11 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading.Tasks;
+using DotNetty.Buffers;
 using DotNetty.Handlers.Logging;
 using DotNetty.Transport.Bootstrapping;
 using DotNetty.Transport.Channels;
@@ -16,6 +18,7 @@
 using Nethermind.Logging;
 using Nethermind.Network.Discovery.Messages;
 using Nethermind.Network.Test.Builders;
+using Nethermind.Serialization.Rlp;
 using Nethermind.Stats.Model;
 using NSubstitute;
 using NUnit.Framework;
@@ -171,6 +174,33 @@ public async Task NeighborsSentReceivedTest()
             AssertMetrics(210);
         }
 
+        [Test]
+        [TestCase("010203")]
+        public async Task ForwardsUnrecognizedMessageToNextHandler(string msgHex)
+        {
+            ResetMetrics();
+
+            NeighborsMsg msg = new(_privateKey2.PublicKey, Timestamper.Default.UnixTime.SecondsLong + 1200, new List<Node>().ToArray())
+            {
+                FarAddress = _address2
+            };
+
+            await _discoveryHandlers[0].SendMsg(msg);
+            await SleepWhileWaiting();
+            _discoveryManagersMocks[1].Received(1).OnIncomingMsg(Arg.Is<DiscoveryMsg>(x => x.MsgType == MsgType.Neighbors));
+
+            NeighborsMsg msg2 = new(_privateKey.PublicKey, Timestamper.Default.UnixTime.SecondsLong + 1200, new List<Node>().ToArray())
+            {
+                FarAddress = _address,
+            };
+
+            await _discoveryHandlers[1].SendMsg(msg2);
+            await SleepWhileWaiting();
+            _discoveryManagersMocks[0].Received(1).OnIncomingMsg(Arg.Is<DiscoveryMsg>(x => x.MsgType == MsgType.Neighbors));
+
+            AssertMetrics(210);
+        }
+
         private static void ResetMetrics()
         {
             Metrics.DiscoveryBytesSent = Metrics.DiscoveryBytesReceived = 0;

src/Nethermind/Nethermind.Network.Discovery.Test/NettyDiscoveryV5HandlerTests.cs

@@ -0,0 +1,79 @@
+// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNetty.Buffers;
+using DotNetty.Transport.Channels;
+using DotNetty.Transport.Channels.Embedded;
+using DotNetty.Transport.Channels.Sockets;
+using FluentAssertions;
+using Microsoft.Extensions.Logging;
+using Nethermind.Serialization.Rlp;
+using NSubstitute;
+using NUnit.Framework;
+
+namespace Nethermind.Network.Discovery.Test
+{
+    [Parallelizable(ParallelScope.Self)]
+    [TestFixture]
+    public class NettyDiscoveryV5HandlerTests
+    {
+        private EmbeddedChannel _channel;
+        private NettyDiscoveryV5Handler _handler;
+
+        [SetUp]
+        public void Initialize()
+        {
+            _channel = new();
+            _handler = new(new LoggerFactory());
+            _handler.InitializeChannel(_channel);
+        }
+
+        [TearDown]
+        public async Task CleanUp()
+        {
+            await _channel.CloseAsync();
+        }
+
+        [Test]
+        public async Task ForwardsSentMessageToChannel()
+        {
+            byte[] data = [1, 2, 3];
+            var to = IPEndPoint.Parse("127.0.0.1:10001");
+
+            await _handler.SendAsync(data, to);
+
+            DatagramPacket packet = _channel.ReadOutbound<DatagramPacket>();
+            packet.Should().NotBeNull();
+            packet.Content.ReadAllBytesAsArray().Should().BeEquivalentTo(data);
+            packet.Recipient.Should().Be(to);
+        }
+
+        [Test]
+        public async Task ForwardsReceivedMessageToReader()
+        {
+            byte[] data = [1, 2, 3];
+            var from = IPEndPoint.Parse("127.0.0.1:10000");
+            var to = IPEndPoint.Parse("127.0.0.1:10001");
+
+            IAsyncEnumerator<UdpReceiveResult> enumerator = _handler.ReadMessagesAsync().GetAsyncEnumerator();
+
+            var ctx = Substitute.For<IChannelHandlerContext>();
+            var packet = new DatagramPacket(Unpooled.WrappedBuffer(data), from, to);
+
+            _handler.ChannelRead(ctx, packet);
+
+            using var cancellationSource = new CancellationTokenSource(10_000);
+            (await enumerator.MoveNextAsync(cancellationSource.Token)).Should().BeTrue();
+            UdpReceiveResult forwardedPacket = enumerator.Current;
+
+            forwardedPacket.Should().NotBeNull();
+            forwardedPacket.Buffer.Should().BeEquivalentTo(data);
+            forwardedPacket.RemoteEndPoint.Should().Be(from);
+        }
+    }
+}