Add version check for block header creation

crates/example-types/src/auction_results_provider_types.rs

@@ -1,14 +1,14 @@
 use anyhow::{bail, Result};
 use async_trait::async_trait;
 use hotshot_types::traits::{
-    auction_results_provider::{AuctionResultsProvider, HasUrls},
-    node_implementation::NodeType,
+    auction_results_provider::AuctionResultsProvider,
+    node_implementation::{HasUrls, NodeType},
 };
 use serde::{Deserialize, Serialize};
 use url::Url;
 
 /// A mock result for the auction solver. This type is just a pointer to a URL.
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[derive(PartialEq, Eq, Debug, Clone, Serialize, Deserialize, Default)]
 pub struct TestAuctionResult {
     /// The URL of the builder to reach out to.
     pub urls: Vec<Url>,
@@ -22,10 +22,10 @@ impl HasUrls for TestAuctionResult {
 
 /// The test auction results type is used to mimic the results from the Solver.
 #[derive(Clone, Debug, Default)]
-pub struct TestAuctionResultsProvider {
+pub struct TestAuctionResultsProvider<TYPES: NodeType> {
     /// We intentionally allow for the results to be pre-cooked for the unit test to gurantee a
     /// particular outcome is met.
-    pub solver_results: TestAuctionResult,
+    pub solver_results: TYPES::AuctionResult,
 
     /// A canned type to ensure that an error is thrown in absence of a true fault-injectible
     /// system for logical tests. This will guarantee that `fetch_auction_result` always throws an
@@ -39,17 +39,15 @@ pub struct TestAuctionResultsProvider {
 }
 
 #[async_trait]
-impl<TYPES: NodeType> AuctionResultsProvider<TYPES> for TestAuctionResultsProvider {
-    type AuctionResult = TestAuctionResult;
-
+impl<TYPES: NodeType> AuctionResultsProvider<TYPES> for TestAuctionResultsProvider<TYPES> {
     /// Mock fetching the auction results, with optional error injection to simulate failure cases
     /// in the solver.
-    async fn fetch_auction_result(&self, view_number: TYPES::Time) -> Result<Self::AuctionResult> {
+    async fn fetch_auction_result(&self, view_number: TYPES::Time) -> Result<TYPES::AuctionResult> {
         if let Some(url) = &self.broadcast_url {
             let resp =
                 reqwest::get(url.join(&format!("/v0/api/auction_results/{}", *view_number))?)
                     .await?
-                    .json::<TestAuctionResult>()
+                    .json::<TYPES::AuctionResult>()
                     .await?;
 
             Ok(resp)

crates/example-types/src/block_types.rs

@@ -23,7 +23,6 @@ use time::OffsetDateTime;
 use vbs::version::Version;
 
 use crate::{
-    auction_results_provider_types::TestAuctionResult,
     node_types::TestTypes,
     state_types::{TestInstanceState, TestValidatedState},
 };
@@ -244,7 +243,6 @@ impl<TYPES: NodeType<BlockHeader = Self, BlockPayload = TestBlockPayload>> Block
     for TestBlockHeader
 {
     type Error = std::convert::Infallible;
-    type AuctionResult = TestAuctionResult;
 
     async fn new_legacy(
         _parent_state: &TYPES::ValidatedState,
@@ -281,7 +279,7 @@ impl<TYPES: NodeType<BlockHeader = Self, BlockPayload = TestBlockPayload>> Block
         _metadata: <TYPES::BlockPayload as BlockPayload<TYPES>>::Metadata,
         _builder_fee: Vec<BuilderFee<TYPES>>,
         _vid_common: VidCommon,
-        _auction_results: Option<Self::AuctionResult>,
+        _auction_results: Option<TYPES::AuctionResult>,
         _version: Version,
     ) -> Result<Self, Self::Error> {
         unimplemented!()
@@ -317,7 +315,7 @@ impl<TYPES: NodeType<BlockHeader = Self, BlockPayload = TestBlockPayload>> Block
         self.builder_commitment.clone()
     }
 
-    fn get_auction_results(&self) -> Option<Self::AuctionResult> {
+    fn get_auction_results(&self) -> Option<TYPES::AuctionResult> {
         unimplemented!()
     }
 }

crates/example-types/src/node_types.rs

@@ -15,7 +15,7 @@ use serde::{Deserialize, Serialize};
 use vbs::version::StaticVersion;
 
 use crate::{
-    auction_results_provider_types::TestAuctionResultsProvider,
+    auction_results_provider_types::{TestAuctionResult, TestAuctionResultsProvider},
     block_types::{TestBlockHeader, TestBlockPayload, TestTransaction},
     state_types::{TestInstanceState, TestValidatedState},
     storage_types::TestStorage,
@@ -38,6 +38,7 @@ use crate::{
 /// to select our traits
 pub struct TestTypes;
 impl NodeType for TestTypes {
+    type AuctionResult = TestAuctionResult;
     type Base = StaticVersion<0, 1>;
     type Upgrade = StaticVersion<0, 2>;
     const UPGRADE_HASH: [u8; 32] = [
@@ -72,6 +73,7 @@ impl NodeType for TestTypes {
 /// to select our traits
 pub struct TestConsecutiveLeaderTypes;
 impl NodeType for TestConsecutiveLeaderTypes {
+    type AuctionResult = TestAuctionResult;
     type Base = StaticVersion<0, 1>;
     type Upgrade = StaticVersion<0, 2>;
     const UPGRADE_HASH: [u8; 32] = [
@@ -116,23 +118,23 @@ pub type StaticMembership = StaticCommittee<TestTypes>;
 impl<TYPES: NodeType> NodeImplementation<TYPES> for PushCdnImpl {
     type Network = PushCdnNetwork<TYPES>;
     type Storage = TestStorage<TYPES>;
-    type AuctionResultsProvider = TestAuctionResultsProvider;
+    type AuctionResultsProvider = TestAuctionResultsProvider<TYPES>;
 }
 
 impl<TYPES: NodeType> NodeImplementation<TYPES> for MemoryImpl {
     type Network = MemoryNetwork<TYPES::SignatureKey>;
     type Storage = TestStorage<TYPES>;
-    type AuctionResultsProvider = TestAuctionResultsProvider;
+    type AuctionResultsProvider = TestAuctionResultsProvider<TYPES>;
 }
 
 impl<TYPES: NodeType> NodeImplementation<TYPES> for CombinedImpl {
     type Network = CombinedNetworks<TYPES>;
     type Storage = TestStorage<TYPES>;
-    type AuctionResultsProvider = TestAuctionResultsProvider;
+    type AuctionResultsProvider = TestAuctionResultsProvider<TYPES>;
 }
 
 impl<TYPES: NodeType> NodeImplementation<TYPES> for Libp2pImpl {
     type Network = Libp2pNetwork<TYPES::SignatureKey>;
     type Storage = TestStorage<TYPES>;
-    type AuctionResultsProvider = TestAuctionResultsProvider;
+    type AuctionResultsProvider = TestAuctionResultsProvider<TYPES>;
 }

crates/examples/combined/types.rs

@@ -20,7 +20,7 @@ pub type Network = CombinedNetworks<TestTypes>;
 impl NodeImplementation<TestTypes> for NodeImpl {
     type Network = Network;
     type Storage = TestStorage<TestTypes>;
-    type AuctionResultsProvider = TestAuctionResultsProvider;
+    type AuctionResultsProvider = TestAuctionResultsProvider<TestTypes>;
 }
 /// convenience type alias
 pub type ThisRun = CombinedDaRun<TestTypes>;

crates/examples/infra/mod.rs

@@ -339,7 +339,7 @@ pub trait RunDa<
         TYPES,
         Network = NETWORK,
         Storage = TestStorage<TYPES>,
-        AuctionResultsProvider = TestAuctionResultsProvider,
+        AuctionResultsProvider = TestAuctionResultsProvider<TYPES>,
     >,
 > where
     <TYPES as NodeType>::ValidatedState: TestableState<TYPES>,
@@ -406,7 +406,7 @@ pub trait RunDa<
             initializer,
             ConsensusMetricsValue::default(),
             TestStorage::<TYPES>::default(),
-            TestAuctionResultsProvider::default(),
+            TestAuctionResultsProvider::<TYPES>::default(),
         )
         .await
         .expect("Could not init hotshot")
@@ -604,7 +604,7 @@ impl<
             TYPES,
             Network = PushCdnNetwork<TYPES>,
             Storage = TestStorage<TYPES>,
-            AuctionResultsProvider = TestAuctionResultsProvider,
+            AuctionResultsProvider = TestAuctionResultsProvider<TYPES>,
         >,
     > RunDa<TYPES, PushCdnNetwork<TYPES>, NODE> for PushCdnDaRun<TYPES>
 where
@@ -681,7 +681,7 @@ impl<
             TYPES,
             Network = Libp2pNetwork<TYPES::SignatureKey>,
             Storage = TestStorage<TYPES>,
-            AuctionResultsProvider = TestAuctionResultsProvider,
+            AuctionResultsProvider = TestAuctionResultsProvider<TYPES>,
         >,
     > RunDa<TYPES, Libp2pNetwork<TYPES::SignatureKey>, NODE> for Libp2pDaRun<TYPES>
 where
@@ -767,7 +767,7 @@ impl<
             TYPES,
             Network = CombinedNetworks<TYPES>,
             Storage = TestStorage<TYPES>,
-            AuctionResultsProvider = TestAuctionResultsProvider,
+            AuctionResultsProvider = TestAuctionResultsProvider<TYPES>,
         >,
     > RunDa<TYPES, CombinedNetworks<TYPES>, NODE> for CombinedDaRun<TYPES>
 where
@@ -837,7 +837,7 @@ pub async fn main_entry_point<
         TYPES,
         Network = NETWORK,
         Storage = TestStorage<TYPES>,
-        AuctionResultsProvider = TestAuctionResultsProvider,
+        AuctionResultsProvider = TestAuctionResultsProvider<TYPES>,
     >,
     RUNDA: RunDa<TYPES, NETWORK, NODE>,
 >(

crates/examples/libp2p/types.rs

@@ -20,7 +20,7 @@ pub type Network = Libp2pNetwork<<TestTypes as NodeType>::SignatureKey>;
 impl NodeImplementation<TestTypes> for NodeImpl {
     type Network = Network;
     type Storage = TestStorage<TestTypes>;
-    type AuctionResultsProvider = TestAuctionResultsProvider;
+    type AuctionResultsProvider = TestAuctionResultsProvider<TestTypes>;
 }
 /// convenience type alias
 pub type ThisRun = Libp2pDaRun<TestTypes>;

crates/examples/push-cdn/types.rs

@@ -17,7 +17,7 @@ pub type Network = PushCdnNetwork<TestTypes>;
 impl NodeImplementation<TestTypes> for NodeImpl {
     type Network = Network;
     type Storage = TestStorage<TestTypes>;
-    type AuctionResultsProvider = TestAuctionResultsProvider;
+    type AuctionResultsProvider = TestAuctionResultsProvider<TestTypes>;
 }
 
 /// Convenience type alias

crates/hotshot/src/traits/election/static_committee.rs

@@ -1,12 +1,14 @@
 use std::{marker::PhantomData, num::NonZeroU64};
 
 use ethereum_types::U256;
-use hotshot_types::traits::network::Topic;
 // use ark_bls12_381::Parameters as Param381;
 use hotshot_types::traits::signature_key::StakeTableEntryType;
 use hotshot_types::{
     signature_key::BLSPubKey,
-    traits::{election::Membership, node_implementation::NodeType, signature_key::SignatureKey},
+    traits::{
+        election::Membership, network::Topic, node_implementation::NodeType,
+        signature_key::SignatureKey,
+    },
     PeerConfig,
 };
 #[cfg(feature = "randomized-leader-election")]

crates/hotshot/src/traits/election/static_committee_leader_two_views.rs

@@ -1,12 +1,14 @@
 use std::{marker::PhantomData, num::NonZeroU64};
 
 use ethereum_types::U256;
-use hotshot_types::traits::network::Topic;
 // use ark_bls12_381::Parameters as Param381;
 use hotshot_types::traits::signature_key::StakeTableEntryType;
 use hotshot_types::{
     signature_key::BLSPubKey,
-    traits::{election::Membership, node_implementation::NodeType, signature_key::SignatureKey},
+    traits::{
+        election::Membership, network::Topic, node_implementation::NodeType,
+        signature_key::SignatureKey,
+    },
     PeerConfig,
 };
 use tracing::debug;