mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-17 11:52:42 +00:00
Merge branch 'unstable' into dvt
This commit is contained in:
@@ -16,7 +16,7 @@ use super::{
|
||||
Signature, SignedRoot,
|
||||
};
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
#[derive(Debug, PartialEq, Clone)]
|
||||
pub enum Error {
|
||||
SszTypesError(ssz_types::Error),
|
||||
BitfieldError(ssz::BitfieldError),
|
||||
|
||||
@@ -85,6 +85,7 @@ pub trait AbstractExecPayload<E: EthSpec>:
|
||||
+ TryInto<Self::Deneb>
|
||||
+ TryInto<Self::Electra>
|
||||
+ TryInto<Self::Fulu>
|
||||
+ Sync
|
||||
{
|
||||
type Ref<'a>: ExecPayload<E>
|
||||
+ Copy
|
||||
@@ -97,23 +98,28 @@ pub trait AbstractExecPayload<E: EthSpec>:
|
||||
type Bellatrix: OwnedExecPayload<E>
|
||||
+ Into<Self>
|
||||
+ for<'a> From<Cow<'a, ExecutionPayloadBellatrix<E>>>
|
||||
+ TryFrom<ExecutionPayloadHeaderBellatrix<E>>;
|
||||
+ TryFrom<ExecutionPayloadHeaderBellatrix<E>>
|
||||
+ Sync;
|
||||
type Capella: OwnedExecPayload<E>
|
||||
+ Into<Self>
|
||||
+ for<'a> From<Cow<'a, ExecutionPayloadCapella<E>>>
|
||||
+ TryFrom<ExecutionPayloadHeaderCapella<E>>;
|
||||
+ TryFrom<ExecutionPayloadHeaderCapella<E>>
|
||||
+ Sync;
|
||||
type Deneb: OwnedExecPayload<E>
|
||||
+ Into<Self>
|
||||
+ for<'a> From<Cow<'a, ExecutionPayloadDeneb<E>>>
|
||||
+ TryFrom<ExecutionPayloadHeaderDeneb<E>>;
|
||||
+ TryFrom<ExecutionPayloadHeaderDeneb<E>>
|
||||
+ Sync;
|
||||
type Electra: OwnedExecPayload<E>
|
||||
+ Into<Self>
|
||||
+ for<'a> From<Cow<'a, ExecutionPayloadElectra<E>>>
|
||||
+ TryFrom<ExecutionPayloadHeaderElectra<E>>;
|
||||
+ TryFrom<ExecutionPayloadHeaderElectra<E>>
|
||||
+ Sync;
|
||||
type Fulu: OwnedExecPayload<E>
|
||||
+ Into<Self>
|
||||
+ for<'a> From<Cow<'a, ExecutionPayloadFulu<E>>>
|
||||
+ TryFrom<ExecutionPayloadHeaderFulu<E>>;
|
||||
+ TryFrom<ExecutionPayloadHeaderFulu<E>>
|
||||
+ Sync;
|
||||
}
|
||||
|
||||
#[superstruct(
|
||||
|
||||
Reference in New Issue
Block a user