mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-30 12:47:05 +00:00
rebase onto fulu
This commit is contained in:
@@ -7399,7 +7399,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
|
||||
}
|
||||
|
||||
pub fn on_verified_inclusion_list(&self, signed_il: SignedInclusionList<T::EthSpec>) {
|
||||
debug!(self.log, "Adding verified inclusion list to the cache");
|
||||
info!(self.log, "Adding verified inclusion list to the cache");
|
||||
self.inclusion_list_cache
|
||||
.write()
|
||||
.on_inclusion_list(signed_il, &self.log);
|
||||
|
||||
@@ -47,7 +47,7 @@ pub struct NewPayloadRequest<'block, E: EthSpec> {
|
||||
pub parent_beacon_block_root: Hash256,
|
||||
#[superstruct(only(Electra, Fulu))]
|
||||
pub execution_requests: &'block ExecutionRequests<E>,
|
||||
#[superstruct(only(Electra, Fulu))]
|
||||
#[superstruct(only(Fulu))]
|
||||
pub il_transactions: InclusionListTransactions<E>,
|
||||
}
|
||||
|
||||
@@ -204,7 +204,6 @@ impl<'a, E: EthSpec> NewPayloadRequest<'a, E> {
|
||||
.collect(),
|
||||
parent_beacon_block_root: block_ref.parent_root,
|
||||
execution_requests: &block_ref.body.execution_requests,
|
||||
il_transactions,
|
||||
})),
|
||||
BeaconBlockRef::Fulu(block_ref) => Ok(Self::Fulu(NewPayloadRequestFulu {
|
||||
execution_payload: &block_ref.body.execution_payload.execution_payload,
|
||||
@@ -259,7 +258,6 @@ impl<'a, E: EthSpec> TryFrom<BeaconBlockRef<'a, E>> for NewPayloadRequest<'a, E>
|
||||
.collect(),
|
||||
parent_beacon_block_root: block_ref.parent_root,
|
||||
execution_requests: &block_ref.body.execution_requests,
|
||||
il_transactions: vec![].into(),
|
||||
})),
|
||||
BeaconBlockRef::Fulu(block_ref) => Ok(Self::Fulu(NewPayloadRequestFulu {
|
||||
execution_payload: &block_ref.body.execution_payload.execution_payload,
|
||||
|
||||
@@ -193,7 +193,7 @@ fn verify_and_publish_inclusion_list<T: BeaconChainTypes>(
|
||||
inclusion_list: &SignedInclusionList<T::EthSpec>,
|
||||
seen_timestamp: Duration,
|
||||
network_tx: &UnboundedSender<NetworkMessage<T::EthSpec>>,
|
||||
_log: &Logger,
|
||||
log: &Logger,
|
||||
) -> Result<(), Error> {
|
||||
let verified_inclusion_list = chain
|
||||
.verify_inclusion_list_for_gossip(inclusion_list)
|
||||
@@ -207,6 +207,12 @@ fn verify_and_publish_inclusion_list<T: BeaconChainTypes>(
|
||||
})
|
||||
.map_err(|_| Error::Publication)?;
|
||||
|
||||
info!(
|
||||
log,
|
||||
"Published inclusion list";
|
||||
"slot" => verified_inclusion_list.signed_il.message.slot
|
||||
);
|
||||
|
||||
// TODO(focil) add reprocess logic?
|
||||
|
||||
// Notify the validator monitor.
|
||||
|
||||
Reference in New Issue
Block a user