VID task and exchange

crates/task-impls/src/vid.rs

@@ -126,14 +126,16 @@ where
 }
 
 #[instrument(skip_all, fields(id = state.id, view = *state.cur_view), name = "VID Vote Collection Task", level = "error")]
-async fn vote_handle<TYPES: NodeType, I: NodeImplementation<TYPES, Leaf = SequencingLeaf<TYPES>>>(
+async fn vote_handle<TYPES, I>(
     mut state: VIDVoteCollectionTaskState<TYPES, I>,
     event: SequencingHotShotEvent<TYPES, I>,
 ) -> (
-    std::option::Option<HotShotTaskCompleted>,
+    Option<HotShotTaskCompleted>,
     VIDVoteCollectionTaskState<TYPES, I>,
 )
 where
+    TYPES: NodeType,
+    I: NodeImplementation<TYPES, Leaf = SequencingLeaf<TYPES>>,
     VIDEx<TYPES, I>: ConsensusExchange<
         TYPES,
         Message<TYPES, I>,
@@ -398,7 +400,7 @@ where
     }
 }
 
-/// task state implementation for DA Task
+/// task state implementation for VID Task
 impl<
         TYPES: NodeType,
         I: NodeImplementation<

crates/testing/tests/vid_task.rs

@@ -1,11 +1,14 @@
 use commit::Committable;
-use hotshot::{tasks::add_vid_task, HotShotSequencingConsensusApi};
+use hotshot::{
+    tasks::add_vid_task,
+    types::{bn254::BLSPubKey, SignatureKey},
+    HotShotSequencingConsensusApi,
+};
 use hotshot_task_impls::events::SequencingHotShotEvent;
 use hotshot_testing::{
     node_types::{SequencingMemoryImpl, SequencingTestTypes},
     task_helpers::vid_init,
 };
-use hotshot_types::traits::election::CommitteeExchangeType;
 use hotshot_types::traits::election::VIDExchangeType;
 use hotshot_types::{
     block_impl::VIDTransaction,
@@ -37,8 +40,8 @@ async fn test_vid_task() {
             inner: handle.hotshot.inner.clone(),
         };
     let vid_exchange = api.inner.exchanges.vid_exchange().clone();
-    let committee_exchange = api.inner.exchanges.committee_exchange().clone();
     let pub_key = *api.public_key();
+    let priv_key = api.private_key();
     let vid = vid_init();
     let txn = vec![0u8];
     let vid_disperse = vid.disperse(&txn).unwrap();
@@ -48,7 +51,7 @@ async fn test_vid_task() {
         commitment: block_commitment,
     };
 
-    let signature = committee_exchange.sign_da_proposal(&block.commit());
+    let signature = BLSPubKey::sign(priv_key, block.commit().as_ref());
     let proposal: DAProposal<SequencingTestTypes> = DAProposal {
         deltas: block.clone(),
         view_number: ViewNumber::new(2),
@@ -66,8 +69,6 @@ async fn test_vid_task() {
         },
         signature: message.signature.clone(),
     };
-    // TODO for now reuse the same block commitment and signature as DA committee
-    // https://github.com/EspressoSystems/jellyfish/issues/369
 
     // Every event input is seen on the event stream in the output.
     let mut input = Vec::new();

crates/types/src/traits/node_implementation.rs

@@ -256,7 +256,12 @@ pub struct SequencingExchanges<
     // https://github.com/EspressoSystems/HotShot/issues/1799
     #[allow(clippy::type_complexity)]
 
-    pub timeout_exchange: TimeoutExchange<TYPES, <<SequencingExchanges<TYPES, MESSAGE, QUORUMEXCHANGE, COMMITTEEEXCHANGE, VIEWSYNCEXCHANGE, VIDEXCHANGE> as ExchangesType<TYPES, SequencingLeaf<TYPES>, MESSAGE>>::QuorumExchange as ConsensusExchange<TYPES, MESSAGE>>::Proposal, <<SequencingExchanges<TYPES, MESSAGE, QUORUMEXCHANGE, COMMITTEEEXCHANGE, VIEWSYNCEXCHANGE, VIDEXCHANGE> as ExchangesType<TYPES, SequencingLeaf<TYPES>, MESSAGE>>::QuorumExchange as ConsensusExchange<TYPES, MESSAGE>>::Membership, <QUORUMEXCHANGE as ConsensusExchange<TYPES, MESSAGE>>::Networking, MESSAGE>,
+    pub timeout_exchange: TimeoutExchange<TYPES, <<SequencingExchanges<TYPES, MESSAGE, QUORUMEXCHANGE, COMMITTEEEXCHANGE, VIEWSYNCEXCHANGE, VIDEXCHANGE>
+        as ExchangesType<TYPES, SequencingLeaf<TYPES>, MESSAGE>>::QuorumExchange
+        as ConsensusExchange<TYPES, MESSAGE>>::Proposal, <<SequencingExchanges<TYPES, MESSAGE, QUORUMEXCHANGE, COMMITTEEEXCHANGE, VIEWSYNCEXCHANGE, VIDEXCHANGE>
+        as ExchangesType<TYPES, SequencingLeaf<TYPES>, MESSAGE>>::QuorumExchange
+        as ConsensusExchange<TYPES, MESSAGE>>::Membership, <QUORUMEXCHANGE
+        as ConsensusExchange<TYPES, MESSAGE>>::Networking, MESSAGE>,
 
     /// Phantom data
     _phantom: PhantomData<(TYPES, MESSAGE)>,
@@ -348,6 +353,7 @@ where
         );
 
         // RM TODO: figure out if this is the proper config
+        // issue: https://github.com/EspressoSystems/HotShot/issues/1918
         let vid_exchange = VIDEXCHANGE::create(entries, configs.1, networks.3, pk, entry, sk);
 
         Self {