gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-22 22:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

beacon: consensus: implement engine api getBlobs

Browse Source
This commit is contained in:
Marius van der Wijden
2022-09-17 14:10:15 +02:00
parent dcfae6c5cf
commit 8473f08d10
6 changed files with 72 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
consensus/types/src/beacon_block_body.rs
View File

@@ -232,7 +232,7 @@ impl<E: EthSpec> From<BeaconBlockBodyMerge<E, FullPayload<E>>>
deposits,
voluntary_exits,
sync_aggregate,
execution_payload: FullPayload { execution_payload, blobs_bundle },
execution_payload: FullPayload { execution_payload },
} = body;
(
@@ -272,7 +272,7 @@ for (
deposits,
voluntary_exits,
sync_aggregate,
execution_payload: FullPayload { execution_payload, blobs_bundle },
execution_payload: FullPayload { execution_payload},
blob_kzg_commitments,
} = body;
@@ -324,7 +324,7 @@ impl<E: EthSpec> BeaconBlockBodyMerge<E, FullPayload<E>> {
deposits,
voluntary_exits,
sync_aggregate,
execution_payload: FullPayload { execution_payload, blobs_bundle },
execution_payload: FullPayload { execution_payload },
} = self;
BeaconBlockBodyMerge {
@@ -356,7 +356,7 @@ impl<E: EthSpec> BeaconBlockBodyEip4844<E, FullPayload<E>> {
deposits,
voluntary_exits,
sync_aggregate,
execution_payload: FullPayload { execution_payload, blobs_bundle },
execution_payload: FullPayload { execution_payload },
blob_kzg_commitments,
} = self;

9
consensus/types/src/payload.rs
View File

@@ -230,8 +230,7 @@ impl<T: EthSpec> Encode for BlindedPayload<T> {
#[derive(Default, Debug, Clone, Serialize, Deserialize)]
#[serde(bound = "T: EthSpec")]
pub struct FullPayload<T: EthSpec> {
pub execution_payload: ExecutionPayload<T>,
pub blobs_bundle: Option<BlobsBundle<T>>,
pub execution_payload: ExecutionPayload<T>
}
impl <T: EthSpec> TestRandom for FullPayload<T> {
@@ -255,8 +254,7 @@ impl <T: EthSpec> Hash for FullPayload<T> {
impl<T: EthSpec> From<ExecutionPayload<T>> for FullPayload<T> {
fn from(execution_payload: ExecutionPayload<T>) -> Self {
Self {
execution_payload,
blobs_bundle: None,
execution_payload
}
}
}
@@ -294,8 +292,7 @@ impl<T: EthSpec> Decode for FullPayload<T> {
fn from_ssz_bytes(bytes: &[u8]) -> Result<Self, DecodeError> {
Ok(FullPayload {
execution_payload: Decode::from_ssz_bytes(bytes)?,
blobs_bundle: None,
execution_payload: Decode::from_ssz_bytes(bytes)?
})
}
}

4
consensus/types/src/signed_beacon_block.rs
View File

@@ -304,7 +304,7 @@ impl<E: EthSpec> SignedBeaconBlockMerge<E, BlindedPayload<E>> {
deposits,
voluntary_exits,
sync_aggregate,
execution_payload: FullPayload { execution_payload: execution_payload, blobs_bundle: None },
execution_payload: FullPayload { execution_payload },
},
},
signature,
@@ -357,7 +357,7 @@ impl<E: EthSpec> SignedBeaconBlockEip4844<E, BlindedPayload<E>> {
deposits,
voluntary_exits,
sync_aggregate,
execution_payload: FullPayload { execution_payload: execution_payload, blobs_bundle: None },
execution_payload: FullPayload { execution_payload },
blob_kzg_commitments,
},
},