gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 09:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix engine api formatting issues

Browse Source
This commit is contained in:
Pawan Dhananjay
2024-10-16 17:30:10 -07:00
parent c8dfe7d3d7
commit 0dd215c294
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -794,7 +794,7 @@ impl HttpJsonRpc {
new_payload_request_electra.versioned_hashes, new_payload_request_electra.versioned_hashes,
new_payload_request_electra.parent_beacon_block_root, new_payload_request_electra.parent_beacon_block_root,
new_payload_request_electra new_payload_request_electra
.execution_requests_list .execution_requests
.get_execution_requests_list(), .get_execution_requests_list(),
]); ]);

7
beacon_node/execution_layer/src/engine_api/json_structures.rs
View File

@@ -379,7 +379,8 @@ impl<E: EthSpec> TryFrom<JsonExecutionRequests> for ExecutionRequests<E> {
for (i, request) in value.0.into_iter().enumerate() { for (i, request) in value.0.into_iter().enumerate() {
// hex string // hex string
let decoded_bytes = hex::decode(request).map_err(|e| format!("Invalid hex {:?}", e))?; let decoded_bytes = hex::decode(request.strip_prefix("0x").unwrap_or(&request))
.map_err(|e| format!("Invalid hex {:?}", e))?;
match RequestPrefix::from_prefix(i as u8) { match RequestPrefix::from_prefix(i as u8) {
Some(RequestPrefix::Deposit) => { Some(RequestPrefix::Deposit) => {
requests.deposits = DepositRequests::<E>::from_ssz_bytes(&decoded_bytes) requests.deposits = DepositRequests::<E>::from_ssz_bytes(&decoded_bytes)
@@ -431,7 +432,7 @@ pub struct JsonGetPayloadResponse<E: EthSpec> {
#[superstruct(only(V3, V4))] #[superstruct(only(V3, V4))]
pub should_override_builder: bool, pub should_override_builder: bool,
#[superstruct(only(V4))] #[superstruct(only(V4))]
pub requests: JsonExecutionRequests, pub execution_requests: JsonExecutionRequests,
} }
impl<E: EthSpec> TryFrom<JsonGetPayloadResponse<E>> for GetPayloadResponse<E> { impl<E: EthSpec> TryFrom<JsonGetPayloadResponse<E>> for GetPayloadResponse<E> {
@@ -464,7 +465,7 @@ impl<E: EthSpec> TryFrom<JsonGetPayloadResponse<E>> for GetPayloadResponse<E> {
block_value: response.block_value, block_value: response.block_value,
blobs_bundle: response.blobs_bundle.into(), blobs_bundle: response.blobs_bundle.into(),
should_override_builder: response.should_override_builder, should_override_builder: response.should_override_builder,
requests: response.requests.try_into()?, requests: response.execution_requests.try_into()?,
})) }))
} }
} }

4
beacon_node/execution_layer/src/engine_api/new_payload_request.rs
View File

@@ -44,7 +44,7 @@ pub struct NewPayloadRequest<'block, E: EthSpec> {
#[superstruct(only(Deneb, Electra))] #[superstruct(only(Deneb, Electra))]
pub parent_beacon_block_root: Hash256, pub parent_beacon_block_root: Hash256,
#[superstruct(only(Electra))] #[superstruct(only(Electra))]
pub execution_requests_list: &'block ExecutionRequests<E>, pub execution_requests: &'block ExecutionRequests<E>,
} }
impl<'block, E: EthSpec> NewPayloadRequest<'block, E> { impl<'block, E: EthSpec> NewPayloadRequest<'block, E> {
@@ -185,7 +185,7 @@ impl<'a, E: EthSpec> TryFrom<BeaconBlockRef<'a, E>> for NewPayloadRequest<'a, E>
.map(kzg_commitment_to_versioned_hash) .map(kzg_commitment_to_versioned_hash)
.collect(), .collect(),
parent_beacon_block_root: block_ref.parent_root, parent_beacon_block_root: block_ref.parent_root,
execution_requests_list: &block_ref.body.execution_requests, execution_requests: &block_ref.body.execution_requests,
})), })),
} }
} }

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

@@ -374,7 +374,7 @@ pub async fn handle_rpc<E: EthSpec>(
.into(), .into(),
should_override_builder: false, should_override_builder: false,
// TODO(electra): add EL requests in mock el // TODO(electra): add EL requests in mock el
requests: Default::default(), execution_requests: Default::default(),
}) })
.unwrap() .unwrap()
} }