From 04d45b2cfa42584484a2619f28daa9ee189ae7d2 Mon Sep 17 00:00:00 2001 From: Marcin Sobczak Date: Thu, 2 Mar 2023 16:06:09 +0100 Subject: [PATCH] Revert "Disable eth68 for now because spec is not final (#5140)" This reverts commit 5d9997040d9f1853599124735a0d001f5f511527. --- src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs | 6 ++---- src/Nethermind/Nethermind.Network/ProtocolsManager.cs | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs b/src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs index 2bd55a0d80c..948cf3392ce 100644 --- a/src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs +++ b/src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs @@ -206,11 +206,9 @@ await InitPeer().ContinueWith(initPeerTask => // we can't add eth67 capability as default, because it needs snap protocol for syncing (GetNodeData is // no longer available). Eth67 should be added if snap is enabled OR sync is finished _api.ProtocolsManager!.AddSupportedCapability(new Capability(Protocol.Eth, 67)); - - // eth68 is disabled for now, as spec has draft status and can change (https://eips.ethereum.org/EIPS/eip-5793) - // _api.ProtocolsManager!.AddSupportedCapability(new Capability(Protocol.Eth, 68)); + _api.ProtocolsManager!.AddSupportedCapability(new Capability(Protocol.Eth, 68)); } - else if (_logger.IsDebug) _logger.Debug("Skipped enabling eth67 capability"); + else if (_logger.IsDebug) _logger.Debug("Skipped enabling eth67 & eth68 capabilities"); if (_syncConfig.SnapSync && !stateSyncFinished) { diff --git a/src/Nethermind/Nethermind.Network/ProtocolsManager.cs b/src/Nethermind/Nethermind.Network/ProtocolsManager.cs index 1abbe8e74fd..43c975e6d25 100644 --- a/src/Nethermind/Nethermind.Network/ProtocolsManager.cs +++ b/src/Nethermind/Nethermind.Network/ProtocolsManager.cs @@ -186,7 +186,7 @@ private IDictionary> GetProtocolFa { 66 => new Eth66ProtocolHandler(session, _serializer, _stats, _syncServer, _txPool, _pooledTxsRequestor, _gossipPolicy, _forkInfo, _logManager), 67 => new Eth67ProtocolHandler(session, _serializer, _stats, _syncServer, _txPool, _pooledTxsRequestor, _gossipPolicy, _forkInfo, _logManager), - // 68 => new Eth68ProtocolHandler(session, _serializer, _stats, _syncServer, _txPool, _pooledTxsRequestor, _gossipPolicy, _forkInfo, _logManager), + 68 => new Eth68ProtocolHandler(session, _serializer, _stats, _syncServer, _txPool, _pooledTxsRequestor, _gossipPolicy, _forkInfo, _logManager), _ => throw new NotSupportedException($"Eth protocol version {version} is not supported.") };