mirror of
https://github.com/sigp/lighthouse.git
synced 2026-07-03 12:54:27 +00:00
Refactor mock builder (#6735)
* Update builder api for electra
* Refactor mock builder to separate functionality
* Return a higher payload value for builder by default
* Add additional methods
* Cleanup
* Add a flag for always returning a max bid
* Add logs for debugging
* Take builder secret key as an argument
* Merge branch 'unstable' into refactor-mock-builder
* Change return type for submit_blinded_blocks
* Merge branch 'unstable' into refactor-mock-builder
* Respect gas_limit from validator registration
* Revert "Respect gas_limit from validator registration"
This reverts commit 1f7b4a327e.
* Merge branch 'unstable' into refactor-mock-builder
* Remove unnecessary derive
This commit is contained in:
@@ -121,8 +121,7 @@ impl<E: EthSpec> TryFrom<BuilderBid<E>> for ProvenancedPayload<BlockProposalCont
|
|||||||
block_value: builder_bid.value,
|
block_value: builder_bid.value,
|
||||||
kzg_commitments: builder_bid.blob_kzg_commitments,
|
kzg_commitments: builder_bid.blob_kzg_commitments,
|
||||||
blobs_and_proofs: None,
|
blobs_and_proofs: None,
|
||||||
// TODO(electra): update this with builder api returning the requests
|
requests: Some(builder_bid.execution_requests),
|
||||||
requests: None,
|
|
||||||
},
|
},
|
||||||
BuilderBid::Fulu(builder_bid) => BlockProposalContents::PayloadAndBlobs {
|
BuilderBid::Fulu(builder_bid) => BlockProposalContents::PayloadAndBlobs {
|
||||||
payload: ExecutionPayloadHeader::Fulu(builder_bid.header).into(),
|
payload: ExecutionPayloadHeader::Fulu(builder_bid.header).into(),
|
||||||
@@ -330,7 +329,7 @@ impl<E: EthSpec, Payload: AbstractExecPayload<E>> BlockProposalContents<E, Paylo
|
|||||||
|
|
||||||
// This just groups together a bunch of parameters that commonly
|
// This just groups together a bunch of parameters that commonly
|
||||||
// get passed around together in calls to get_payload.
|
// get passed around together in calls to get_payload.
|
||||||
#[derive(Clone, Copy)]
|
#[derive(Clone, Copy, Debug)]
|
||||||
pub struct PayloadParameters<'a> {
|
pub struct PayloadParameters<'a> {
|
||||||
pub parent_hash: ExecutionBlockHash,
|
pub parent_hash: ExecutionBlockHash,
|
||||||
pub parent_gas_limit: u64,
|
pub parent_gas_limit: u64,
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -2,8 +2,8 @@ use crate::beacon_block_body::KzgCommitments;
|
|||||||
use crate::{
|
use crate::{
|
||||||
ChainSpec, EthSpec, ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella,
|
ChainSpec, EthSpec, ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella,
|
||||||
ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderFulu,
|
ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderFulu,
|
||||||
ExecutionPayloadHeaderRef, ExecutionPayloadHeaderRefMut, ForkName, ForkVersionDeserialize,
|
ExecutionPayloadHeaderRef, ExecutionPayloadHeaderRefMut, ExecutionRequests, ForkName,
|
||||||
SignedRoot, Uint256,
|
ForkVersionDeserialize, SignedRoot, Uint256,
|
||||||
};
|
};
|
||||||
use bls::PublicKeyBytes;
|
use bls::PublicKeyBytes;
|
||||||
use bls::Signature;
|
use bls::Signature;
|
||||||
@@ -36,6 +36,8 @@ pub struct BuilderBid<E: EthSpec> {
|
|||||||
pub header: ExecutionPayloadHeaderFulu<E>,
|
pub header: ExecutionPayloadHeaderFulu<E>,
|
||||||
#[superstruct(only(Deneb, Electra, Fulu))]
|
#[superstruct(only(Deneb, Electra, Fulu))]
|
||||||
pub blob_kzg_commitments: KzgCommitments<E>,
|
pub blob_kzg_commitments: KzgCommitments<E>,
|
||||||
|
#[superstruct(only(Electra, Fulu))]
|
||||||
|
pub execution_requests: ExecutionRequests<E>,
|
||||||
#[serde(with = "serde_utils::quoted_u256")]
|
#[serde(with = "serde_utils::quoted_u256")]
|
||||||
pub value: Uint256,
|
pub value: Uint256,
|
||||||
pub pubkey: PublicKeyBytes,
|
pub pubkey: PublicKeyBytes,
|
||||||
|
|||||||
Reference in New Issue
Block a user