Feature/disable nodedata on halfpath (#7906)

asdacap · web-flow · commit f2afa1b83a97 · 2024-12-13T20:19:04.000+08:00
diff --git a/src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs b/src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs
@@ -404,6 +404,10 @@ private async Task InitPeer()
         {
             _api.ProtocolsManager!.AddSupportedCapability(new Capability(Protocol.Snap, 1));
         }
+        if (!_api.WorldStateManager!.SupportHashLookup)
+        {
+            _api.ProtocolsManager!.RemoveSupportedCapability(new Capability(Protocol.NodeData, 1));
+        }
 
         _api.ProtocolValidator = protocolValidator;
 
diff --git a/src/Nethermind/Nethermind.Network.Test/P2P/P2PProtocolHandlerTests.cs b/src/Nethermind/Nethermind.Network.Test/P2P/P2PProtocolHandlerTests.cs
@@ -84,9 +84,16 @@ public void On_init_sends_a_hello_message()
         public void On_init_sends_a_hello_message_with_capabilities()
         {
             P2PProtocolHandler p2PProtocolHandler = CreateSession();
+            string[] expectedCapabilities = ["eth66", "eth67", "eth68", "nodedata1"];
+
+            // These are called by ProtocolsManager.
+            p2PProtocolHandler.AddSupportedCapability(new Capability(Protocol.Eth, 66));
+            p2PProtocolHandler.AddSupportedCapability(new Capability(Protocol.Eth, 67));
+            p2PProtocolHandler.AddSupportedCapability(new Capability(Protocol.Eth, 68));
+            p2PProtocolHandler.AddSupportedCapability(new Capability(Protocol.NodeData, 1));
+
             p2PProtocolHandler.Init();
 
-            string[] expectedCapabilities = ["eth66", "eth67", "eth68", "nodedata1"];
             _session.Received(1).DeliverMessage(
                 Arg.Is<HelloMessage>(m => m.Capabilities.Select(c => c.ToString()).SequenceEqual(expectedCapabilities)));
         }
diff --git a/src/Nethermind/Nethermind.Network/P2P/P2PProtocolInfoProvider.cs b/src/Nethermind/Nethermind.Network/P2P/P2PProtocolInfoProvider.cs
@@ -14,7 +14,7 @@ public static class P2PProtocolInfoProvider
         public static int GetHighestVersionOfEthProtocol()
         {
             int highestVersion = 0;
-            foreach (Capability ethProtocol in P2PProtocolHandler.DefaultCapabilities)
+            foreach (Capability ethProtocol in ProtocolsManager.DefaultCapabilities)
             {
                 if (ethProtocol.ProtocolCode == Protocol.Eth && highestVersion < ethProtocol.Version)
                     highestVersion = ethProtocol.Version;
@@ -25,7 +25,7 @@ public static int GetHighestVersionOfEthProtocol()
 
         public static string DefaultCapabilitiesToString()
         {
-            IEnumerable<string> capabilities = P2PProtocolHandler.DefaultCapabilities
+            IEnumerable<string> capabilities = ProtocolsManager.DefaultCapabilities
                 .OrderBy(x => x.ProtocolCode).ThenByDescending(x => x.Version)
                 .Select(x => $"{x.ProtocolCode}/{x.Version}");
             return string.Join(",", capabilities);
diff --git a/src/Nethermind/Nethermind.Network/P2P/ProtocolHandlers/P2PProtocolHandler.cs b/src/Nethermind/Nethermind.Network/P2P/ProtocolHandlers/P2PProtocolHandler.cs
@@ -49,17 +49,9 @@ public class P2PProtocolHandler(
 
     protected override TimeSpan InitTimeout => Timeouts.P2PHello;
 
-    public static readonly IEnumerable<Capability> DefaultCapabilities = new Capability[]
-    {
-        new(Protocol.Eth, 66),
-        new(Protocol.Eth, 67),
-        new(Protocol.Eth, 68),
-        new(Protocol.NodeData, 1)
-    };
-
     public IReadOnlyList<Capability> AgreedCapabilities { get { return _agreedCapabilities; } }
     public IReadOnlyList<Capability> AvailableCapabilities { get { return _availableCapabilities; } }
-    private readonly List<Capability> _supportedCapabilities = DefaultCapabilities.ToList();
+    private readonly List<Capability> _supportedCapabilities = new List<Capability>();
 
     public int ListenPort { get; } = session.LocalPort;
     public PublicKey LocalNodeId { get; } = localNodeId;
diff --git a/src/Nethermind/Nethermind.Network/ProtocolsManager.cs b/src/Nethermind/Nethermind.Network/ProtocolsManager.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Linq;
 using System.Numerics;
 using System.Text.RegularExpressions;
 using Nethermind.Config;
@@ -35,6 +36,14 @@ namespace Nethermind.Network
 {
     public class ProtocolsManager : IProtocolsManager
     {
+        public static readonly IEnumerable<Capability> DefaultCapabilities = new Capability[]
+        {
+            new(Protocol.Eth, 66),
+            new(Protocol.Eth, 67),
+            new(Protocol.Eth, 68),
+            new(Protocol.NodeData, 1)
+        };
+
         private readonly ConcurrentDictionary<Guid, SyncPeerProtocolHandlerBase> _syncPeers = new();
 
         private readonly ConcurrentDictionary<Node, ConcurrentDictionary<Guid, ProtocolHandlerBase>> _hangingSatelliteProtocols =
@@ -54,11 +63,10 @@ public class ProtocolsManager : IProtocolsManager
         private readonly ForkInfo _forkInfo;
         private readonly IGossipPolicy _gossipPolicy;
         private readonly ITxGossipPolicy _txGossipPolicy;
-        private readonly INetworkConfig _networkConfig;
         private readonly ILogManager _logManager;
         private readonly ILogger _logger;
         private readonly IDictionary<string, Func<ISession, int, IProtocolHandler>> _protocolFactories;
-        private readonly HashSet<Capability> _capabilities = new();
+        private readonly HashSet<Capability> _capabilities = DefaultCapabilities.ToHashSet();
         private readonly Regex? _clientIdPattern;
         private readonly IBackgroundTaskScheduler _backgroundTaskScheduler;
         private readonly ISnapServer? _snapServer;
@@ -98,7 +106,6 @@ public ProtocolsManager(
             _gossipPolicy = gossipPolicy ?? throw new ArgumentNullException(nameof(gossipPolicy));
             _txGossipPolicy = transactionsGossipPolicy ?? ShouldGossip.Instance;
             _logManager = logManager ?? throw new ArgumentNullException(nameof(logManager));
-            _networkConfig = networkConfig ?? throw new ArgumentNullException(nameof(networkConfig));
             _snapServer = snapServer;
             _logger = _logManager?.GetClassLogger() ?? throw new ArgumentNullException(nameof(logManager));
 
diff --git a/src/Nethermind/Nethermind.State.Test/WorldStateManagerTests.cs b/src/Nethermind/Nethermind.State.Test/WorldStateManagerTests.cs
@@ -38,4 +38,19 @@ public void ShouldProxyReorgBoundaryEvent()
 
         gotEvent.Should().BeTrue();
     }
+
+    [TestCase(INodeStorage.KeyScheme.Hash, true)]
+    [TestCase(INodeStorage.KeyScheme.HalfPath, false)]
+    public void ShouldNotSupportHashLookupOnHalfpath(INodeStorage.KeyScheme keyScheme, bool hashSupported)
+    {
+        IWorldState worldState = Substitute.For<IWorldState>();
+        ITrieStore trieStore = Substitute.For<ITrieStore>();
+        IReadOnlyTrieStore readOnlyTrieStore = Substitute.For<IReadOnlyTrieStore>();
+        trieStore.AsReadOnly().Returns(readOnlyTrieStore);
+        readOnlyTrieStore.Scheme.Returns(keyScheme);
+        IDbProvider dbProvider = TestMemDbProvider.Init();
+        WorldStateManager worldStateManager = new WorldStateManager(worldState, trieStore, dbProvider, LimboLogs.Instance);
+
+        worldStateManager.SupportHashLookup.Should().Be(hashSupported);
+    }
 }
diff --git a/src/Nethermind/Nethermind.State/IWorldStateManager.cs b/src/Nethermind/Nethermind.State/IWorldStateManager.cs
@@ -11,6 +11,7 @@ public interface IWorldStateManager
     IWorldState GlobalWorldState { get; }
     IStateReader GlobalStateReader { get; }
     IReadOnlyTrieStore TrieStore { get; }
+    bool SupportHashLookup { get; }
 
     /// <summary>
     /// Used by read only tasks that need to execute blocks.
diff --git a/src/Nethermind/Nethermind.State/OverlayWorldStateManager.cs b/src/Nethermind/Nethermind.State/OverlayWorldStateManager.cs
@@ -26,6 +26,7 @@ public class OverlayWorldStateManager(
     public IStateReader GlobalStateReader => _reader;
 
     public IReadOnlyTrieStore TrieStore { get; } = overlayTrieStore.AsReadOnly();
+    public bool SupportHashLookup => overlayTrieStore.Scheme == INodeStorage.KeyScheme.Hash;
 
     public IWorldState CreateResettableWorldState(IWorldState? forWarmup = null)
     {
diff --git a/src/Nethermind/Nethermind.State/OverridableWorldStateManager.cs b/src/Nethermind/Nethermind.State/OverridableWorldStateManager.cs
@@ -31,6 +31,7 @@ public OverridableWorldStateManager(IDbProvider dbProvider, IReadOnlyTrieStore t
     public IWorldState GlobalWorldState => _state;
     public IStateReader GlobalStateReader => _reader;
     public IReadOnlyTrieStore TrieStore => _overlayTrieStore.AsReadOnly();
+    public bool SupportHashLookup => _overlayTrieStore.Scheme == INodeStorage.KeyScheme.Hash;
 
     public IWorldState CreateResettableWorldState(IWorldState? forWarmup = null)
     {
diff --git a/src/Nethermind/Nethermind.State/ReadOnlyWorldStateManager.cs b/src/Nethermind/Nethermind.State/ReadOnlyWorldStateManager.cs
@@ -37,6 +37,7 @@ ILogManager logManager
     public IStateReader GlobalStateReader { get; }
 
     public IReadOnlyTrieStore TrieStore => _readOnlyTrieStore;
+    public bool SupportHashLookup => _readOnlyTrieStore.Scheme == INodeStorage.KeyScheme.Hash;
 
     public IWorldState CreateResettableWorldState(IWorldState? forWarmup = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -404,6 +404,10 @@ private async Task InitPeer()`
`404`	`404`	`{`
`405`	`405`	`_api.ProtocolsManager!.AddSupportedCapability(new Capability(Protocol.Snap, 1));`
`406`	`406`	`}`
	`407`	`+ if (!_api.WorldStateManager!.SupportHashLookup)`
	`408`	`+ {`
	`409`	`+ _api.ProtocolsManager!.RemoveSupportedCapability(new Capability(Protocol.NodeData, 1));`
	`410`	`+ }`
`407`	`411`
`408`	`412`	`_api.ProtocolValidator = protocolValidator;`
`409`	`413`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public static class P2PProtocolInfoProvider`
`14`	`14`	`public static int GetHighestVersionOfEthProtocol()`
`15`	`15`	`{`
`16`	`16`	`int highestVersion = 0;`
`17`		`- foreach (Capability ethProtocol in P2PProtocolHandler.DefaultCapabilities)`
	`17`	`+ foreach (Capability ethProtocol in ProtocolsManager.DefaultCapabilities)`
`18`	`18`	`{`
`19`	`19`	`if (ethProtocol.ProtocolCode == Protocol.Eth && highestVersion < ethProtocol.Version)`
`20`	`20`	`highestVersion = ethProtocol.Version;`
`@@ -25,7 +25,7 @@ public static int GetHighestVersionOfEthProtocol()`
`25`	`25`
`26`	`26`	`public static string DefaultCapabilitiesToString()`
`27`	`27`	`{`
`28`		`- IEnumerable<string> capabilities = P2PProtocolHandler.DefaultCapabilities`
	`28`	`+ IEnumerable<string> capabilities = ProtocolsManager.DefaultCapabilities`
`29`	`29`	`.OrderBy(x => x.ProtocolCode).ThenByDescending(x => x.Version)`
`30`	`30`	`.Select(x => $"{x.ProtocolCode}/{x.Version}");`
`31`	`31`	`return string.Join(",", capabilities);`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public class OverlayWorldStateManager(`
`26`	`26`	`public IStateReader GlobalStateReader => _reader;`
`27`	`27`
`28`	`28`	`public IReadOnlyTrieStore TrieStore { get; } = overlayTrieStore.AsReadOnly();`
	`29`	`+ public bool SupportHashLookup => overlayTrieStore.Scheme == INodeStorage.KeyScheme.Hash;`
`29`	`30`
`30`	`31`	`public IWorldState CreateResettableWorldState(IWorldState? forWarmup = null)`
`31`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public OverridableWorldStateManager(IDbProvider dbProvider, IReadOnlyTrieStore t`
`31`	`31`	`public IWorldState GlobalWorldState => _state;`
`32`	`32`	`public IStateReader GlobalStateReader => _reader;`
`33`	`33`	`public IReadOnlyTrieStore TrieStore => _overlayTrieStore.AsReadOnly();`
	`34`	`+ public bool SupportHashLookup => _overlayTrieStore.Scheme == INodeStorage.KeyScheme.Hash;`
`34`	`35`
`35`	`36`	`public IWorldState CreateResettableWorldState(IWorldState? forWarmup = null)`
`36`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ ILogManager logManager`
`37`	`37`	`public IStateReader GlobalStateReader { get; }`
`38`	`38`
`39`	`39`	`public IReadOnlyTrieStore TrieStore => _readOnlyTrieStore;`
	`40`	`+ public bool SupportHashLookup => _readOnlyTrieStore.Scheme == INodeStorage.KeyScheme.Hash;`
`40`	`41`
`41`	`42`	`public IWorldState CreateResettableWorldState(IWorldState? forWarmup = null)`
`42`	`43`	`{`