Fix PublishBlockRequest SSZ decoding (#5078)
* Fix PublishBlockRequest SSZ decoding * Send header for block v1 ssz client * Delete unused function
This commit is contained in:
parent
2a161cef73
commit
185646acb2
@ -45,7 +45,7 @@ use eth2::types::{
|
|||||||
PublishBlockRequest, ValidatorBalancesRequestBody, ValidatorId, ValidatorStatus,
|
PublishBlockRequest, ValidatorBalancesRequestBody, ValidatorId, ValidatorStatus,
|
||||||
ValidatorsRequestBody,
|
ValidatorsRequestBody,
|
||||||
};
|
};
|
||||||
use eth2::{CONTENT_TYPE_HEADER, SSZ_CONTENT_TYPE_HEADER};
|
use eth2::{CONSENSUS_VERSION_HEADER, CONTENT_TYPE_HEADER, SSZ_CONTENT_TYPE_HEADER};
|
||||||
use lighthouse_network::{types::SyncState, EnrExt, NetworkGlobals, PeerId, PubsubMessage};
|
use lighthouse_network::{types::SyncState, EnrExt, NetworkGlobals, PeerId, PubsubMessage};
|
||||||
use lighthouse_version::version_with_platform;
|
use lighthouse_version::version_with_platform;
|
||||||
use logging::SSELoggingComponents;
|
use logging::SSELoggingComponents;
|
||||||
@ -1249,6 +1249,8 @@ pub fn serve<T: BeaconChainTypes>(
|
|||||||
/*
|
/*
|
||||||
* beacon/blocks
|
* beacon/blocks
|
||||||
*/
|
*/
|
||||||
|
let consensus_version_header_filter =
|
||||||
|
warp::header::header::<ForkName>(CONSENSUS_VERSION_HEADER);
|
||||||
|
|
||||||
// POST beacon/blocks
|
// POST beacon/blocks
|
||||||
let post_beacon_blocks = eth_v1
|
let post_beacon_blocks = eth_v1
|
||||||
@ -1286,12 +1288,14 @@ pub fn serve<T: BeaconChainTypes>(
|
|||||||
.and(warp::path("blocks"))
|
.and(warp::path("blocks"))
|
||||||
.and(warp::path::end())
|
.and(warp::path::end())
|
||||||
.and(warp::body::bytes())
|
.and(warp::body::bytes())
|
||||||
|
.and(consensus_version_header_filter)
|
||||||
.and(task_spawner_filter.clone())
|
.and(task_spawner_filter.clone())
|
||||||
.and(chain_filter.clone())
|
.and(chain_filter.clone())
|
||||||
.and(network_tx_filter.clone())
|
.and(network_tx_filter.clone())
|
||||||
.and(log_filter.clone())
|
.and(log_filter.clone())
|
||||||
.then(
|
.then(
|
||||||
move |block_bytes: Bytes,
|
move |block_bytes: Bytes,
|
||||||
|
consensus_version: ForkName,
|
||||||
task_spawner: TaskSpawner<T::EthSpec>,
|
task_spawner: TaskSpawner<T::EthSpec>,
|
||||||
chain: Arc<BeaconChain<T>>,
|
chain: Arc<BeaconChain<T>>,
|
||||||
network_tx: UnboundedSender<NetworkMessage<T::EthSpec>>,
|
network_tx: UnboundedSender<NetworkMessage<T::EthSpec>>,
|
||||||
@ -1299,7 +1303,7 @@ pub fn serve<T: BeaconChainTypes>(
|
|||||||
task_spawner.spawn_async_with_rejection(Priority::P0, async move {
|
task_spawner.spawn_async_with_rejection(Priority::P0, async move {
|
||||||
let block_contents = PublishBlockRequest::<T::EthSpec>::from_ssz_bytes(
|
let block_contents = PublishBlockRequest::<T::EthSpec>::from_ssz_bytes(
|
||||||
&block_bytes,
|
&block_bytes,
|
||||||
&chain.spec,
|
consensus_version,
|
||||||
)
|
)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
warp_utils::reject::custom_bad_request(format!("invalid SSZ: {e:?}"))
|
warp_utils::reject::custom_bad_request(format!("invalid SSZ: {e:?}"))
|
||||||
@ -1356,6 +1360,7 @@ pub fn serve<T: BeaconChainTypes>(
|
|||||||
.and(warp::query::<api_types::BroadcastValidationQuery>())
|
.and(warp::query::<api_types::BroadcastValidationQuery>())
|
||||||
.and(warp::path::end())
|
.and(warp::path::end())
|
||||||
.and(warp::body::bytes())
|
.and(warp::body::bytes())
|
||||||
|
.and(consensus_version_header_filter)
|
||||||
.and(task_spawner_filter.clone())
|
.and(task_spawner_filter.clone())
|
||||||
.and(chain_filter.clone())
|
.and(chain_filter.clone())
|
||||||
.and(network_tx_filter.clone())
|
.and(network_tx_filter.clone())
|
||||||
@ -1363,6 +1368,7 @@ pub fn serve<T: BeaconChainTypes>(
|
|||||||
.then(
|
.then(
|
||||||
move |validation_level: api_types::BroadcastValidationQuery,
|
move |validation_level: api_types::BroadcastValidationQuery,
|
||||||
block_bytes: Bytes,
|
block_bytes: Bytes,
|
||||||
|
consensus_version: ForkName,
|
||||||
task_spawner: TaskSpawner<T::EthSpec>,
|
task_spawner: TaskSpawner<T::EthSpec>,
|
||||||
chain: Arc<BeaconChain<T>>,
|
chain: Arc<BeaconChain<T>>,
|
||||||
network_tx: UnboundedSender<NetworkMessage<T::EthSpec>>,
|
network_tx: UnboundedSender<NetworkMessage<T::EthSpec>>,
|
||||||
@ -1370,7 +1376,7 @@ pub fn serve<T: BeaconChainTypes>(
|
|||||||
task_spawner.spawn_async_with_rejection(Priority::P0, async move {
|
task_spawner.spawn_async_with_rejection(Priority::P0, async move {
|
||||||
let block_contents = PublishBlockRequest::<T::EthSpec>::from_ssz_bytes(
|
let block_contents = PublishBlockRequest::<T::EthSpec>::from_ssz_bytes(
|
||||||
&block_bytes,
|
&block_bytes,
|
||||||
&chain.spec,
|
consensus_version,
|
||||||
)
|
)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
warp_utils::reject::custom_bad_request(format!("invalid SSZ: {e:?}"))
|
warp_utils::reject::custom_bad_request(format!("invalid SSZ: {e:?}"))
|
||||||
|
@ -2,17 +2,16 @@ use beacon_chain::{
|
|||||||
test_utils::{AttestationStrategy, BlockStrategy},
|
test_utils::{AttestationStrategy, BlockStrategy},
|
||||||
GossipVerifiedBlock, IntoGossipVerifiedBlockContents,
|
GossipVerifiedBlock, IntoGossipVerifiedBlockContents,
|
||||||
};
|
};
|
||||||
|
use eth2::reqwest::StatusCode;
|
||||||
use eth2::types::{BroadcastValidation, PublishBlockRequest, SignedBeaconBlock};
|
use eth2::types::{BroadcastValidation, PublishBlockRequest, SignedBeaconBlock};
|
||||||
use http_api::test_utils::InteractiveTester;
|
use http_api::test_utils::InteractiveTester;
|
||||||
use http_api::{publish_blinded_block, publish_block, reconstruct_block, ProvenancedBlock};
|
use http_api::{publish_blinded_block, publish_block, reconstruct_block, ProvenancedBlock};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use tree_hash::TreeHash;
|
use tree_hash::TreeHash;
|
||||||
use types::{Hash256, MainnetEthSpec, Slot};
|
use types::{Epoch, EthSpec, ForkName, Hash256, MainnetEthSpec, Slot};
|
||||||
use warp::Rejection;
|
use warp::Rejection;
|
||||||
use warp_utils::reject::CustomBadRequest;
|
use warp_utils::reject::CustomBadRequest;
|
||||||
|
|
||||||
use eth2::reqwest::StatusCode;
|
|
||||||
|
|
||||||
type E = MainnetEthSpec;
|
type E = MainnetEthSpec;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -190,7 +189,10 @@ pub async fn gossip_full_pass_ssz() {
|
|||||||
// `validator_count // 32`.
|
// `validator_count // 32`.
|
||||||
let validator_count = 64;
|
let validator_count = 64;
|
||||||
let num_initial: u64 = 31;
|
let num_initial: u64 = 31;
|
||||||
let tester = InteractiveTester::<E>::new(None, validator_count).await;
|
// Deneb epoch set ahead of block slot, to test fork-based decoding
|
||||||
|
let mut spec = ForkName::Capella.make_genesis_spec(MainnetEthSpec::default_spec());
|
||||||
|
spec.deneb_fork_epoch = Some(Epoch::new(4));
|
||||||
|
let tester = InteractiveTester::<E>::new(Some(spec), validator_count).await;
|
||||||
|
|
||||||
// Create some chain depth.
|
// Create some chain depth.
|
||||||
tester.harness.advance_slot();
|
tester.harness.advance_slot();
|
||||||
|
@ -377,25 +377,6 @@ impl BeaconNodeHttpClient {
|
|||||||
ok_or_error(response).await
|
ok_or_error(response).await
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Generic POST function supporting arbitrary responses and timeouts.
|
|
||||||
async fn post_generic_with_ssz_body<T: Into<Body>, U: IntoUrl>(
|
|
||||||
&self,
|
|
||||||
url: U,
|
|
||||||
body: T,
|
|
||||||
timeout: Option<Duration>,
|
|
||||||
) -> Result<Response, Error> {
|
|
||||||
let mut builder = self.client.post(url);
|
|
||||||
if let Some(timeout) = timeout {
|
|
||||||
builder = builder.timeout(timeout);
|
|
||||||
}
|
|
||||||
let response = builder
|
|
||||||
.header("Content-Type", "application/octet-stream")
|
|
||||||
.body(body)
|
|
||||||
.send()
|
|
||||||
.await?;
|
|
||||||
ok_or_error(response).await
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Generic POST function supporting arbitrary responses and timeouts.
|
/// Generic POST function supporting arbitrary responses and timeouts.
|
||||||
async fn post_generic_with_consensus_version<T: Serialize, U: IntoUrl>(
|
async fn post_generic_with_consensus_version<T: Serialize, U: IntoUrl>(
|
||||||
&self,
|
&self,
|
||||||
@ -866,10 +847,11 @@ impl BeaconNodeHttpClient {
|
|||||||
.push("beacon")
|
.push("beacon")
|
||||||
.push("blocks");
|
.push("blocks");
|
||||||
|
|
||||||
self.post_generic_with_ssz_body(
|
self.post_generic_with_consensus_version_and_ssz_body(
|
||||||
path,
|
path,
|
||||||
block_contents.as_ssz_bytes(),
|
block_contents.as_ssz_bytes(),
|
||||||
Some(self.timeouts.proposal),
|
Some(self.timeouts.proposal),
|
||||||
|
block_contents.signed_block().fork_name_unchecked(),
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
@ -910,8 +892,13 @@ impl BeaconNodeHttpClient {
|
|||||||
.push("beacon")
|
.push("beacon")
|
||||||
.push("blinded_blocks");
|
.push("blinded_blocks");
|
||||||
|
|
||||||
self.post_generic_with_ssz_body(path, block.as_ssz_bytes(), Some(self.timeouts.proposal))
|
self.post_generic_with_consensus_version_and_ssz_body(
|
||||||
.await?;
|
path,
|
||||||
|
block.as_ssz_bytes(),
|
||||||
|
Some(self.timeouts.proposal),
|
||||||
|
block.fork_name_unchecked(),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
@ -1487,7 +1487,7 @@ mod tests {
|
|||||||
.expect("should convert into signed block contents");
|
.expect("should convert into signed block contents");
|
||||||
|
|
||||||
let decoded: PublishBlockRequest<E> =
|
let decoded: PublishBlockRequest<E> =
|
||||||
PublishBlockRequest::from_ssz_bytes(&block.as_ssz_bytes(), &spec)
|
PublishBlockRequest::from_ssz_bytes(&block.as_ssz_bytes(), ForkName::Capella)
|
||||||
.expect("should decode Block");
|
.expect("should decode Block");
|
||||||
assert!(matches!(decoded, PublishBlockRequest::Block(_)));
|
assert!(matches!(decoded, PublishBlockRequest::Block(_)));
|
||||||
}
|
}
|
||||||
@ -1505,9 +1505,11 @@ mod tests {
|
|||||||
let kzg_proofs = KzgProofs::<E>::from(vec![KzgProof::empty()]);
|
let kzg_proofs = KzgProofs::<E>::from(vec![KzgProof::empty()]);
|
||||||
let signed_block_contents = PublishBlockRequest::new(block, Some((kzg_proofs, blobs)));
|
let signed_block_contents = PublishBlockRequest::new(block, Some((kzg_proofs, blobs)));
|
||||||
|
|
||||||
let decoded: PublishBlockRequest<E> =
|
let decoded: PublishBlockRequest<E> = PublishBlockRequest::from_ssz_bytes(
|
||||||
PublishBlockRequest::from_ssz_bytes(&signed_block_contents.as_ssz_bytes(), &spec)
|
&signed_block_contents.as_ssz_bytes(),
|
||||||
.expect("should decode BlockAndBlobSidecars");
|
ForkName::Deneb,
|
||||||
|
)
|
||||||
|
.expect("should decode BlockAndBlobSidecars");
|
||||||
assert!(matches!(decoded, PublishBlockRequest::BlockContents(_)));
|
assert!(matches!(decoded, PublishBlockRequest::BlockContents(_)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1746,22 +1748,11 @@ impl<T: EthSpec> PublishBlockRequest<T> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// SSZ decode with fork variant determined by slot.
|
/// SSZ decode with fork variant determined by `fork_name`.
|
||||||
pub fn from_ssz_bytes(bytes: &[u8], spec: &ChainSpec) -> Result<Self, ssz::DecodeError> {
|
pub fn from_ssz_bytes(bytes: &[u8], fork_name: ForkName) -> Result<Self, ssz::DecodeError> {
|
||||||
let slot_len = <Slot as Decode>::ssz_fixed_len();
|
match fork_name {
|
||||||
let slot_bytes = bytes
|
|
||||||
.get(0..slot_len)
|
|
||||||
.ok_or(DecodeError::InvalidByteLength {
|
|
||||||
len: bytes.len(),
|
|
||||||
expected: slot_len,
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let slot = Slot::from_ssz_bytes(slot_bytes)?;
|
|
||||||
let fork_at_slot = spec.fork_name_at_slot::<T>(slot);
|
|
||||||
|
|
||||||
match fork_at_slot {
|
|
||||||
ForkName::Base | ForkName::Altair | ForkName::Merge | ForkName::Capella => {
|
ForkName::Base | ForkName::Altair | ForkName::Merge | ForkName::Capella => {
|
||||||
SignedBeaconBlock::from_ssz_bytes(bytes, spec)
|
SignedBeaconBlock::from_ssz_bytes_for_fork(bytes, fork_name)
|
||||||
.map(|block| PublishBlockRequest::Block(block))
|
.map(|block| PublishBlockRequest::Block(block))
|
||||||
}
|
}
|
||||||
ForkName::Deneb => {
|
ForkName::Deneb => {
|
||||||
@ -1771,8 +1762,9 @@ impl<T: EthSpec> PublishBlockRequest<T> {
|
|||||||
builder.register_type::<BlobsList<T>>()?;
|
builder.register_type::<BlobsList<T>>()?;
|
||||||
|
|
||||||
let mut decoder = builder.build()?;
|
let mut decoder = builder.build()?;
|
||||||
let block = decoder
|
let block = decoder.decode_next_with(|bytes| {
|
||||||
.decode_next_with(|bytes| SignedBeaconBlock::from_ssz_bytes(bytes, spec))?;
|
SignedBeaconBlock::from_ssz_bytes_for_fork(bytes, fork_name)
|
||||||
|
})?;
|
||||||
let kzg_proofs = decoder.decode_next()?;
|
let kzg_proofs = decoder.decode_next()?;
|
||||||
let blobs = decoder.decode_next()?;
|
let blobs = decoder.decode_next()?;
|
||||||
Ok(PublishBlockRequest::new(block, Some((kzg_proofs, blobs))))
|
Ok(PublishBlockRequest::new(block, Some((kzg_proofs, blobs))))
|
||||||
|
@ -104,6 +104,16 @@ impl<E: EthSpec, Payload: AbstractExecPayload<E>> SignedBeaconBlock<E, Payload>
|
|||||||
Self::from_ssz_bytes_with(bytes, |bytes| BeaconBlock::from_ssz_bytes(bytes, spec))
|
Self::from_ssz_bytes_with(bytes, |bytes| BeaconBlock::from_ssz_bytes(bytes, spec))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// SSZ decode with explicit fork variant.
|
||||||
|
pub fn from_ssz_bytes_for_fork(
|
||||||
|
bytes: &[u8],
|
||||||
|
fork_name: ForkName,
|
||||||
|
) -> Result<Self, ssz::DecodeError> {
|
||||||
|
Self::from_ssz_bytes_with(bytes, |bytes| {
|
||||||
|
BeaconBlock::from_ssz_bytes_for_fork(bytes, fork_name)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// SSZ decode which attempts to decode all variants (slow).
|
/// SSZ decode which attempts to decode all variants (slow).
|
||||||
pub fn any_from_ssz_bytes(bytes: &[u8]) -> Result<Self, ssz::DecodeError> {
|
pub fn any_from_ssz_bytes(bytes: &[u8]) -> Result<Self, ssz::DecodeError> {
|
||||||
Self::from_ssz_bytes_with(bytes, BeaconBlock::any_from_ssz_bytes)
|
Self::from_ssz_bytes_with(bytes, BeaconBlock::any_from_ssz_bytes)
|
||||||
|
Loading…
Reference in New Issue
Block a user