gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-09 11:25:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Save For Later

Browse Source
This commit is contained in:
Mark Mackey
2024-10-01 14:29:12 -05:00
parent e0b8c8e7eb
commit fd140038c5
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
consensus/types/src/execution_payload_envelope.rs → consensus/types/src/execution_envelope.rs
View File

@@ -38,7 +38,7 @@ use tree_hash_derive::TreeHash;
#[arbitrary(bound = "E: EthSpec")]
#[ssz(enum_behaviour = "transparent")]
#[tree_hash(enum_behaviour = "transparent")]
pub struct ExecutionPayloadEnvelope<E: EthSpec> {
pub struct ExecutionEnvelope<E: EthSpec> {
#[superstruct(only(EIP7732), partial_getter(rename = "payload_eip7732"))]
pub payload: ExecutionPayloadEIP7732<E>,
#[serde(with = "serde_utils::quoted_u64")]

10
consensus/types/src/lib.rs
View File

@@ -41,8 +41,8 @@ pub mod eth1_data;
pub mod eth_spec;
pub mod execution_bid;
pub mod execution_block_hash;
pub mod execution_envelope;
pub mod execution_payload;
pub mod execution_payload_envelope;
pub mod execution_payload_header;
pub mod fork;
pub mod fork_data;
@@ -77,7 +77,7 @@ pub mod signed_beacon_block_header;
pub mod signed_bls_to_execution_change;
pub mod signed_contribution_and_proof;
pub mod signed_execution_bid;
pub mod signed_execution_payload_envelope;
pub mod signed_execution_envelope;
pub mod signed_voluntary_exit;
pub mod signing_data;
pub mod sync_committee_subscription;
@@ -172,14 +172,12 @@ pub use crate::eth_spec::EthSpecId;
pub use crate::execution_bid::ExecutionBid;
pub use crate::execution_block_hash::ExecutionBlockHash;
pub use crate::execution_block_header::{EncodableExecutionBlockHeader, ExecutionBlockHeader};
pub use crate::execution_envelope::{ExecutionEnvelope, ExecutionEnvelopeEIP7732};
pub use crate::execution_payload::{
ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb,
ExecutionPayloadEIP7732, ExecutionPayloadElectra, ExecutionPayloadRef, Transaction,
Transactions, Withdrawals,
};
pub use crate::execution_payload_envelope::{
ExecutionPayloadEnvelope, ExecutionPayloadEnvelopeEIP7732,
};
pub use crate::execution_payload_header::{
ExecutionPayloadHeader, ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella,
ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderRef,
@@ -255,7 +253,7 @@ pub use crate::signed_beacon_block_header::SignedBeaconBlockHeader;
pub use crate::signed_bls_to_execution_change::SignedBlsToExecutionChange;
pub use crate::signed_contribution_and_proof::SignedContributionAndProof;
pub use crate::signed_execution_bid::SignedExecutionBid;
pub use crate::signed_execution_payload_envelope::SignedExecutionPayloadEnvelope;
pub use crate::signed_execution_envelope::SignedExecutionEnvelope;
pub use crate::signed_voluntary_exit::SignedVoluntaryExit;
pub use crate::signing_data::{SignedRoot, SigningData};
pub use crate::slot_epoch::{Epoch, Slot};

4
consensus/types/src/signed_execution_payload_envelope.rs → consensus/types/src/signed_execution_envelope.rs
View File

@@ -37,8 +37,8 @@ use tree_hash_derive::TreeHash;
#[arbitrary(bound = "E: EthSpec")]
#[ssz(enum_behaviour = "transparent")]
#[tree_hash(enum_behaviour = "transparent")]
pub struct SignedExecutionPayloadEnvelope<E: EthSpec> {
pub struct SignedExecutionEnvelope<E: EthSpec> {
#[superstruct(only(EIP7732), partial_getter(rename = "message_eip7732"))]
pub message: ExecutionPayloadEnvelopeEIP7732<E>,
pub message: ExecutionEnvelopeEIP7732<E>,
pub signature: Signature,
}