mirror/lighthouse-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/lighthouse-pulse.git synced 2024-12-22 03:30:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Delete PRE_CAPELLA_ENGINE_CAPABILITIES (#5406)

Browse Source 
* Adjust width

* Commit changes

* Delete PRE_CAPELLA_ENGINE_CAPABILITIES

* Revert "Adjust width"

This reverts commit 6fea81b897ce4a346c90902f1c95190875afc2d9.

* Revert "Commit changes"

This reverts commit d00859a63e526c791e0fec25acdaa2557da2fb95.

* Simplify

* Merge branch 'delete-pre-capella' of https://github.com/chong-he/lighthouse into delete-pre-capella
This commit is contained in:
chonghe 2024-03-24 05:30:36 +08:00 committed by GitHub
parent a0e64d0652
commit 19b0db2cdf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,23 +71,6 @@ pub static LIGHTHOUSE_CAPABILITIES: &[&str] = &[
ENGINE_GET_PAYLOAD_BODIES_BY_RANGE_V1, ENGINE_GET_PAYLOAD_BODIES_BY_RANGE_V1,
]; ];
/// This is necessary because a user might run a capella-enabled version of
/// lighthouse before they update to a capella-enabled execution engine.
// TODO (mark): rip this out once we are post-capella on mainnet
pub static PRE_CAPELLA_ENGINE_CAPABILITIES: EngineCapabilities = EngineCapabilities {
new_payload_v1: true,
new_payload_v2: false,
new_payload_v3: false,
forkchoice_updated_v1: true,
forkchoice_updated_v2: false,
forkchoice_updated_v3: false,
get_payload_bodies_by_hash_v1: false,
get_payload_bodies_by_range_v1: false,
get_payload_v1: true,
get_payload_v2: false,
get_payload_v3: false,
};
/// Contains methods to convert arbitrary bytes to an ETH2 deposit contract object. /// Contains methods to convert arbitrary bytes to an ETH2 deposit contract object.
pub mod deposit_log { pub mod deposit_log {
use ssz::Decode; use ssz::Decode;
@ -1012,38 +995,29 @@ impl HttpJsonRpc {
pub async fn exchange_capabilities(&self) -> Result<EngineCapabilities, Error> { pub async fn exchange_capabilities(&self) -> Result<EngineCapabilities, Error> {
let params = json!([LIGHTHOUSE_CAPABILITIES]); let params = json!([LIGHTHOUSE_CAPABILITIES]);
let response: Result<HashSet<String>, _> = self let capabilities: HashSet<String> = self
.rpc_request( .rpc_request(
ENGINE_EXCHANGE_CAPABILITIES, ENGINE_EXCHANGE_CAPABILITIES,
params, params,
ENGINE_EXCHANGE_CAPABILITIES_TIMEOUT * self.execution_timeout_multiplier, ENGINE_EXCHANGE_CAPABILITIES_TIMEOUT * self.execution_timeout_multiplier,
) )
.await; .await?;
match response { Ok(EngineCapabilities {
// TODO (mark): rip this out once we are post capella on mainnet new_payload_v1: capabilities.contains(ENGINE_NEW_PAYLOAD_V1),
Err(error) => match error { new_payload_v2: capabilities.contains(ENGINE_NEW_PAYLOAD_V2),
Error::ServerMessage { code, message: _ } if code == METHOD_NOT_FOUND_CODE => { new_payload_v3: capabilities.contains(ENGINE_NEW_PAYLOAD_V3),
Ok(PRE_CAPELLA_ENGINE_CAPABILITIES) forkchoice_updated_v1: capabilities.contains(ENGINE_FORKCHOICE_UPDATED_V1),
} forkchoice_updated_v2: capabilities.contains(ENGINE_FORKCHOICE_UPDATED_V2),
_ => Err(error), forkchoice_updated_v3: capabilities.contains(ENGINE_FORKCHOICE_UPDATED_V3),
}, get_payload_bodies_by_hash_v1: capabilities
Ok(capabilities) => Ok(EngineCapabilities { .contains(ENGINE_GET_PAYLOAD_BODIES_BY_HASH_V1),
new_payload_v1: capabilities.contains(ENGINE_NEW_PAYLOAD_V1), get_payload_bodies_by_range_v1: capabilities
new_payload_v2: capabilities.contains(ENGINE_NEW_PAYLOAD_V2), .contains(ENGINE_GET_PAYLOAD_BODIES_BY_RANGE_V1),
new_payload_v3: capabilities.contains(ENGINE_NEW_PAYLOAD_V3), get_payload_v1: capabilities.contains(ENGINE_GET_PAYLOAD_V1),
forkchoice_updated_v1: capabilities.contains(ENGINE_FORKCHOICE_UPDATED_V1), get_payload_v2: capabilities.contains(ENGINE_GET_PAYLOAD_V2),
forkchoice_updated_v2: capabilities.contains(ENGINE_FORKCHOICE_UPDATED_V2), get_payload_v3: capabilities.contains(ENGINE_GET_PAYLOAD_V3),
forkchoice_updated_v3: capabilities.contains(ENGINE_FORKCHOICE_UPDATED_V3), })
get_payload_bodies_by_hash_v1: capabilities
.contains(ENGINE_GET_PAYLOAD_BODIES_BY_HASH_V1),
get_payload_bodies_by_range_v1: capabilities
.contains(ENGINE_GET_PAYLOAD_BODIES_BY_RANGE_V1),
get_payload_v1: capabilities.contains(ENGINE_GET_PAYLOAD_V1),
get_payload_v2: capabilities.contains(ENGINE_GET_PAYLOAD_V2),
get_payload_v3: capabilities.contains(ENGINE_GET_PAYLOAD_V3),
}),
}
} }
pub async fn clear_exchange_capabilties_cache(&self) { pub async fn clear_exchange_capabilties_cache(&self) {