Merge conflicts

This commit is contained in:
Eitan Seri-Levi
2026-04-30 09:48:04 +02:00
86 changed files with 2835 additions and 1038 deletions

View File

@@ -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);
}