mirror of
https://github.com/sigp/lighthouse.git
synced 2026-04-20 22:38:34 +00:00
Add Gloas SSE event boilerplate (#9053)
Implement boilerplate for new SSE events as specified in - https://github.com/ethereum/beacon-APIs/pull/588 While that one is not merged yet, I believe the SSE events might be utilized in Dora already. Implement the boilerplate, i.e. subscription tracking and publish queues. A PR to implement to fully implement already implementable events will follow. Co-Authored-By: Daniel Knopik <daniel@dknopik.de>
This commit is contained in:
@@ -1070,6 +1070,33 @@ pub struct BlockGossip {
|
||||
pub slot: Slot,
|
||||
pub block: Hash256,
|
||||
}
|
||||
#[derive(PartialEq, Debug, Serialize, Deserialize, Clone)]
|
||||
pub struct SseExecutionPayload {
|
||||
pub slot: Slot,
|
||||
#[serde(with = "serde_utils::quoted_u64")]
|
||||
pub builder_index: u64,
|
||||
pub block_hash: ExecutionBlockHash,
|
||||
pub block_root: Hash256,
|
||||
pub state_root: Hash256,
|
||||
pub execution_optimistic: bool,
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Debug, Serialize, Deserialize, Clone)]
|
||||
pub struct SseExecutionPayloadGossip {
|
||||
pub slot: Slot,
|
||||
#[serde(with = "serde_utils::quoted_u64")]
|
||||
pub builder_index: u64,
|
||||
pub block_hash: ExecutionBlockHash,
|
||||
pub block_root: Hash256,
|
||||
pub state_root: Hash256,
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Debug, Serialize, Deserialize, Clone)]
|
||||
pub struct SseExecutionPayloadAvailable {
|
||||
pub slot: Slot,
|
||||
pub block_root: Hash256,
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Debug, Serialize, Deserialize, Clone)]
|
||||
pub struct SseChainReorg {
|
||||
pub slot: Slot,
|
||||
@@ -1134,6 +1161,8 @@ pub struct SseExtendedPayloadAttributesGeneric<T> {
|
||||
|
||||
pub type SseExtendedPayloadAttributes = SseExtendedPayloadAttributesGeneric<SsePayloadAttributes>;
|
||||
pub type VersionedSsePayloadAttributes = ForkVersionedResponse<SseExtendedPayloadAttributes>;
|
||||
pub type VersionedSseExecutionPayloadBid<E> = ForkVersionedResponse<SignedExecutionPayloadBid<E>>;
|
||||
pub type VersionedSsePayloadAttestationMessage = ForkVersionedResponse<PayloadAttestationMessage>;
|
||||
|
||||
impl<'de> ContextDeserialize<'de, ForkName> for SsePayloadAttributes {
|
||||
fn context_deserialize<D>(deserializer: D, context: ForkName) -> Result<Self, D::Error>
|
||||
@@ -1210,6 +1239,11 @@ pub enum EventKind<E: EthSpec> {
|
||||
AttesterSlashing(Box<AttesterSlashing<E>>),
|
||||
BlsToExecutionChange(Box<SignedBlsToExecutionChange>),
|
||||
BlockGossip(Box<BlockGossip>),
|
||||
ExecutionPayload(SseExecutionPayload),
|
||||
ExecutionPayloadGossip(SseExecutionPayloadGossip),
|
||||
ExecutionPayloadAvailable(SseExecutionPayloadAvailable),
|
||||
ExecutionPayloadBid(Box<VersionedSseExecutionPayloadBid<E>>),
|
||||
PayloadAttestationMessage(Box<VersionedSsePayloadAttestationMessage>),
|
||||
}
|
||||
|
||||
impl<E: EthSpec> EventKind<E> {
|
||||
@@ -1233,6 +1267,11 @@ impl<E: EthSpec> EventKind<E> {
|
||||
EventKind::AttesterSlashing(_) => "attester_slashing",
|
||||
EventKind::BlsToExecutionChange(_) => "bls_to_execution_change",
|
||||
EventKind::BlockGossip(_) => "block_gossip",
|
||||
EventKind::ExecutionPayload(_) => "execution_payload",
|
||||
EventKind::ExecutionPayloadGossip(_) => "execution_payload_gossip",
|
||||
EventKind::ExecutionPayloadAvailable(_) => "execution_payload_available",
|
||||
EventKind::ExecutionPayloadBid(_) => "execution_payload_bid",
|
||||
EventKind::PayloadAttestationMessage(_) => "payload_attestation_message",
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1322,6 +1361,40 @@ impl<E: EthSpec> EventKind<E> {
|
||||
"block_gossip" => Ok(EventKind::BlockGossip(serde_json::from_str(data).map_err(
|
||||
|e| ServerError::InvalidServerSentEvent(format!("Block Gossip: {:?}", e)),
|
||||
)?)),
|
||||
"execution_payload" => Ok(EventKind::ExecutionPayload(
|
||||
serde_json::from_str(data).map_err(|e| {
|
||||
ServerError::InvalidServerSentEvent(format!("Execution Payload: {:?}", e))
|
||||
})?,
|
||||
)),
|
||||
"execution_payload_gossip" => Ok(EventKind::ExecutionPayloadGossip(
|
||||
serde_json::from_str(data).map_err(|e| {
|
||||
ServerError::InvalidServerSentEvent(format!(
|
||||
"Execution Payload Gossip: {:?}",
|
||||
e
|
||||
))
|
||||
})?,
|
||||
)),
|
||||
"execution_payload_available" => Ok(EventKind::ExecutionPayloadAvailable(
|
||||
serde_json::from_str(data).map_err(|e| {
|
||||
ServerError::InvalidServerSentEvent(format!(
|
||||
"Execution Payload Available: {:?}",
|
||||
e
|
||||
))
|
||||
})?,
|
||||
)),
|
||||
"execution_payload_bid" => Ok(EventKind::ExecutionPayloadBid(Box::new(
|
||||
serde_json::from_str(data).map_err(|e| {
|
||||
ServerError::InvalidServerSentEvent(format!("Execution Payload Bid: {:?}", e))
|
||||
})?,
|
||||
))),
|
||||
"payload_attestation_message" => Ok(EventKind::PayloadAttestationMessage(Box::new(
|
||||
serde_json::from_str(data).map_err(|e| {
|
||||
ServerError::InvalidServerSentEvent(format!(
|
||||
"Payload Attestation Message: {:?}",
|
||||
e
|
||||
))
|
||||
})?,
|
||||
))),
|
||||
_ => Err(ServerError::InvalidServerSentEvent(
|
||||
"Could not parse event tag".to_string(),
|
||||
)),
|
||||
@@ -1357,6 +1430,11 @@ pub enum EventTopic {
|
||||
ProposerSlashing,
|
||||
BlsToExecutionChange,
|
||||
BlockGossip,
|
||||
ExecutionPayload,
|
||||
ExecutionPayloadGossip,
|
||||
ExecutionPayloadAvailable,
|
||||
ExecutionPayloadBid,
|
||||
PayloadAttestationMessage,
|
||||
}
|
||||
|
||||
impl FromStr for EventTopic {
|
||||
@@ -1382,6 +1460,11 @@ impl FromStr for EventTopic {
|
||||
"proposer_slashing" => Ok(EventTopic::ProposerSlashing),
|
||||
"bls_to_execution_change" => Ok(EventTopic::BlsToExecutionChange),
|
||||
"block_gossip" => Ok(EventTopic::BlockGossip),
|
||||
"execution_payload" => Ok(EventTopic::ExecutionPayload),
|
||||
"execution_payload_gossip" => Ok(EventTopic::ExecutionPayloadGossip),
|
||||
"execution_payload_available" => Ok(EventTopic::ExecutionPayloadAvailable),
|
||||
"execution_payload_bid" => Ok(EventTopic::ExecutionPayloadBid),
|
||||
"payload_attestation_message" => Ok(EventTopic::PayloadAttestationMessage),
|
||||
_ => Err("event topic cannot be parsed.".to_string()),
|
||||
}
|
||||
}
|
||||
@@ -1408,6 +1491,15 @@ impl fmt::Display for EventTopic {
|
||||
EventTopic::ProposerSlashing => write!(f, "proposer_slashing"),
|
||||
EventTopic::BlsToExecutionChange => write!(f, "bls_to_execution_change"),
|
||||
EventTopic::BlockGossip => write!(f, "block_gossip"),
|
||||
EventTopic::ExecutionPayload => write!(f, "execution_payload"),
|
||||
EventTopic::ExecutionPayloadGossip => write!(f, "execution_payload_gossip"),
|
||||
EventTopic::ExecutionPayloadAvailable => {
|
||||
write!(f, "execution_payload_available")
|
||||
}
|
||||
EventTopic::ExecutionPayloadBid => write!(f, "execution_payload_bid"),
|
||||
EventTopic::PayloadAttestationMessage => {
|
||||
write!(f, "payload_attestation_message")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user