Merge branch 'update-signed-blob-sidecar' into post-block-and-blobs

This commit is contained in:
Jimmy Chen 2023-03-14 11:52:25 +11:00
commit 9ba390f7c5
No known key found for this signature in database
GPG Key ID: 7AAEE02659DCF690
3 changed files with 4 additions and 4 deletions

View File

@ -320,7 +320,7 @@ impl<T: EthSpec> std::fmt::Display for PubsubMessage<T> {
PubsubMessage::BlobSidecar(data) => write!( PubsubMessage::BlobSidecar(data) => write!(
f, f,
"BlobSidecar: slot: {}, blob index: {}", "BlobSidecar: slot: {}, blob index: {}",
data.1.blob.slot, data.1.blob.index, data.1.message.slot, data.1.message.index,
), ),
PubsubMessage::AggregateAndProofAttestation(att) => write!( PubsubMessage::AggregateAndProofAttestation(att) => write!(
f, f,

View File

@ -664,8 +664,8 @@ impl<T: BeaconChainTypes> Worker<T> {
"peer_id" => %peer_id, "peer_id" => %peer_id,
"client" => %peer_client, "client" => %peer_client,
"blob_topic" => blob_index, "blob_topic" => blob_index,
"blob_index" => signed_blob.blob.index, "blob_index" => signed_blob.message.index,
"blob_slot" => signed_blob.blob.slot "blob_slot" => signed_blob.message.slot
); );
} }

View File

@ -19,6 +19,6 @@ use tree_hash_derive::TreeHash;
#[serde(bound = "T: EthSpec")] #[serde(bound = "T: EthSpec")]
#[arbitrary(bound = "T: EthSpec")] #[arbitrary(bound = "T: EthSpec")]
pub struct SignedBlobSidecar<T: EthSpec> { pub struct SignedBlobSidecar<T: EthSpec> {
pub blob: BlobSidecar<T>, pub message: BlobSidecar<T>,
pub signature: Signature, pub signature: Signature,
} }