Fixes after rebasing eip4844

This commit is contained in:
Emilia Hane
2023-01-26 22:18:29 +01:00
parent 5437dcae9c
commit 4d3ff347a3
9 changed files with 65 additions and 32 deletions

View File

@@ -38,13 +38,13 @@ use tokio::{
time::sleep,
};
use tokio_stream::wrappers::WatchStream;
use types::consts::eip4844::BLOB_TX_TYPE;
use types::transaction::{AccessTuple, BlobTransaction};
use types::{
blobs_sidecar::{Blobs, KzgCommitments},
ExecutionPayload, ExecutionPayloadCapella, ExecutionPayloadEip4844, ExecutionPayloadMerge,
};
use types::{AbstractExecPayload, BeaconStateError, ExecPayload};
use types::consts::eip4844::BLOB_TX_TYPE;
use types::transaction::{AccessTuple, BlobTransaction};
use types::{
BlindedPayload, BlockType, ChainSpec, Epoch, ExecutionBlockHash, ForkName,
ProposerPreparationData, PublicKeyBytes, Signature, SignedBeaconBlock, Slot, Transaction,
@@ -131,7 +131,7 @@ pub enum BlockProposalContents<T: EthSpec, Payload: AbstractExecPayload<T>> {
},
PayloadAndBlobs {
payload: Payload,
block_value: Uint256,
block_value: Uint256,
kzg_commitments: KzgCommitments<T>,
},
}