cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

add v3 to capabilities

Browse Source
This commit is contained in:
realbigsean 2023-02-14 15:52:53 -05:00 committed by Emilia Hane
parent 13efd47238
commit 44dbccfeae
No known key found for this signature in database
GPG Key ID: E73394F9C09206FA
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/execution_layer/src/engine_api.rs
View File

@ -2,7 +2,7 @@ use crate::engines::ForkchoiceState;
use crate::http::{ use crate::http::{
ENGINE_EXCHANGE_TRANSITION_CONFIGURATION_V1, ENGINE_FORKCHOICE_UPDATED_V1, ENGINE_EXCHANGE_TRANSITION_CONFIGURATION_V1, ENGINE_FORKCHOICE_UPDATED_V1,
ENGINE_FORKCHOICE_UPDATED_V2, ENGINE_GET_PAYLOAD_V1, ENGINE_GET_PAYLOAD_V2, ENGINE_FORKCHOICE_UPDATED_V2, ENGINE_GET_PAYLOAD_V1, ENGINE_GET_PAYLOAD_V2,
ENGINE_NEW_PAYLOAD_V1, ENGINE_NEW_PAYLOAD_V2, ENGINE_GET_PAYLOAD_V3, ENGINE_NEW_PAYLOAD_V1, ENGINE_NEW_PAYLOAD_V2, ENGINE_NEW_PAYLOAD_V3,
}; };
use crate::BlobTxConversionError; use crate::BlobTxConversionError;
pub use ethers_core::types::Transaction; pub use ethers_core::types::Transaction;
@ -414,6 +414,9 @@ impl EngineCapabilities {
if self.new_payload_v2 { if self.new_payload_v2 {
response.push(ENGINE_NEW_PAYLOAD_V2); response.push(ENGINE_NEW_PAYLOAD_V2);
} }
if self.new_payload_v3 {
response.push(ENGINE_NEW_PAYLOAD_V3);
}
if self.forkchoice_updated_v1 { if self.forkchoice_updated_v1 {
response.push(ENGINE_FORKCHOICE_UPDATED_V1); response.push(ENGINE_FORKCHOICE_UPDATED_V1);
} }
@ -426,6 +429,9 @@ impl EngineCapabilities {
if self.get_payload_v2 { if self.get_payload_v2 {
response.push(ENGINE_GET_PAYLOAD_V2); response.push(ENGINE_GET_PAYLOAD_V2);
} }
if self.get_payload_v3 {
response.push(ENGINE_GET_PAYLOAD_V3);
}
if self.exchange_transition_configuration_v1 { if self.exchange_transition_configuration_v1 {
response.push(ENGINE_EXCHANGE_TRANSITION_CONFIGURATION_V1); response.push(ENGINE_EXCHANGE_TRANSITION_CONFIGURATION_V1);
} }

2
beacon_node/execution_layer/src/engine_api/http.rs
View File

@ -63,8 +63,10 @@ pub const METHOD_NOT_FOUND_CODE: i64 = -32601;
pub static LIGHTHOUSE_CAPABILITIES: &[&str] = &[ pub static LIGHTHOUSE_CAPABILITIES: &[&str] = &[
ENGINE_NEW_PAYLOAD_V1, ENGINE_NEW_PAYLOAD_V1,
ENGINE_NEW_PAYLOAD_V2, ENGINE_NEW_PAYLOAD_V2,
ENGINE_NEW_PAYLOAD_V3,
ENGINE_GET_PAYLOAD_V1, ENGINE_GET_PAYLOAD_V1,
ENGINE_GET_PAYLOAD_V2, ENGINE_GET_PAYLOAD_V2,
ENGINE_GET_PAYLOAD_V3,
ENGINE_FORKCHOICE_UPDATED_V1, ENGINE_FORKCHOICE_UPDATED_V1,
ENGINE_FORKCHOICE_UPDATED_V2, ENGINE_FORKCHOICE_UPDATED_V2,
ENGINE_EXCHANGE_TRANSITION_CONFIGURATION_V1, ENGINE_EXCHANGE_TRANSITION_CONFIGURATION_V1,

2
beacon_node/execution_layer/src/test_utils/handle_rpc.rs
View File

@ -152,7 +152,7 @@ pub async fn handle_rpc<T: EthSpec>(
ForkName::Eip4844 => { ForkName::Eip4844 => {
if method == ENGINE_NEW_PAYLOAD_V1 || method == ENGINE_NEW_PAYLOAD_V2 { if method == ENGINE_NEW_PAYLOAD_V1 || method == ENGINE_NEW_PAYLOAD_V2 {
return Err(( return Err((
format!("{} called after capella fork!", method), format!("{} called after eip4844 fork!", method),
GENERIC_ERROR_CODE, GENERIC_ERROR_CODE,
)); ));
} }