Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bin/ethlambda/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,7 @@ async fn run_node(options: Options) -> eyre::Result<()> {
payload_attestation_pool.clone(),
builder_market.clone(),
sync_committee_pool.clone(),
Some(Arc::new(events.clone())),
)
.await
.wrap_err("failed to start discv5 discovery")?;
Expand Down
62 changes: 62 additions & 0 deletions crates/blockchain/src/beacon_envelope.rs
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,14 @@ impl BlockChainServer {
held.envelope.message.payload.block_hash,
);
self.envelopes.verified.push_back(root);
let message = &held.envelope.message;
self.events.publish_envelope_imported(
&self.store,
slot,
message.builder_index,
message.payload.block_hash,
root,
);
true
}

Expand Down Expand Up @@ -2329,6 +2337,60 @@ mod tests {
envelope.message.payload.block_hash
}

/// The actor's import of an envelope is what publishes `execution_payload`,
/// and `execution_payload_available` right after it.
#[tokio::test]
#[cfg_attr(
not(feature = "beacon-spec-tests"),
ignore = "needs the fork choice fixtures; run `make consensus-spec-tests`"
)]
async fn an_imported_envelope_emits_execution_payload_then_available() {
let case = Case::new("on_execution_payload_envelope", FULL_CHILD_CASE);
let mut server = case.server(12);
server
.on_block(case.block(FULL_PARENT), ImportTimings::default())
.await;
let mut rx = server.events.subscribe();
let envelope = valid_envelope_for_full_parent();
let builder_index = envelope.message.builder_index;
let block_hash = payload_hash(&envelope);

server.receive_envelope(envelope, 0).await;

let payload_events: Vec<_> = std::iter::from_fn(|| rx.try_recv().ok())
.filter(|event| {
matches!(
event,
crate::ChainEvent::ExecutionPayload(_)
| crate::ChainEvent::ExecutionPayloadAvailable(_)
)
})
.collect();
let slot = server
.store
.block_slot_and_state_root(&root(FULL_PARENT))
.expect("the parent is imported")
.0;
match payload_events.as_slice() {
[
crate::ChainEvent::ExecutionPayload(payload),
crate::ChainEvent::ExecutionPayloadAvailable(available),
] => {
assert_eq!(
(payload.slot, payload.builder_index, payload.block_hash),
(slot, builder_index, block_hash)
);
assert_eq!(payload.block_root, root(FULL_PARENT));
assert!(!payload.execution_optimistic);
assert_eq!(
(available.slot, available.block_root),
(slot, root(FULL_PARENT))
);
}
other => panic!("expected execution_payload then available, got {other:?}"),
}
}

#[tokio::test]
#[cfg_attr(
not(feature = "beacon-spec-tests"),
Expand Down
Loading
Loading