Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring back eth68 #5356

Merged
merged 1 commit into from
Mar 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Network/ProtocolsManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ private IDictionary<string, Func<ISession, int, IProtocolHandler>> 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.")
};

Expand Down