mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-30 12:47:05 +00:00
Merge conflicts
This commit is contained in:
@@ -554,16 +554,7 @@ fn methods_required_for_fork(
|
||||
missing_methods.push(ENGINE_NEW_PAYLOAD_V4);
|
||||
}
|
||||
}
|
||||
// TODO(EIP7805) check capabilities
|
||||
ForkName::Eip7805 => {
|
||||
if !capabilities.get_payload_v5 {
|
||||
missing_methods.push(ENGINE_GET_PAYLOAD_V5);
|
||||
}
|
||||
if !capabilities.new_payload_v4 {
|
||||
missing_methods.push(ENGINE_NEW_PAYLOAD_V4);
|
||||
}
|
||||
}
|
||||
ForkName::Gloas => {
|
||||
ForkName::Gloas | ForkName::Heze => {
|
||||
if !capabilities.get_payload_v6 {
|
||||
missing_methods.push(ENGINE_GET_PAYLOAD_V6);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user