common: Move address from SignedVote to Vote

Code/common/src/context.rs

@@ -39,9 +39,17 @@ where
 
     /// Build a new prevote vote by the validator with the given address,
     /// for the value identified by the given value id, at the given round.
-    fn new_prevote(round: Round, value_id: Option<ValueId<Self>>) -> Self::Vote;
+    fn new_prevote(
+        round: Round,
+        value_id: Option<ValueId<Self>>,
+        address: Self::Address,
+    ) -> Self::Vote;
 
     /// Build a new precommit vote by the validator with the given address,
     /// for the value identified by the given value id, at the given round.
-    fn new_precommit(round: Round, value_id: Option<ValueId<Self>>) -> Self::Vote;
+    fn new_precommit(
+        round: Round,
+        value_id: Option<ValueId<Self>>,
+        address: Self::Address,
+    ) -> Self::Vote;
 }

Code/common/src/signed_vote.rs

@@ -1,4 +1,4 @@
-use crate::{Context, Signature};
+use crate::{Context, Signature, Vote};
 
 // TODO: Do we need to abstract over `SignedVote` as well?
 
@@ -8,19 +8,18 @@ where
     Ctx: Context,
 {
     pub vote: Ctx::Vote,
-    pub address: Ctx::Address,
     pub signature: Signature<Ctx>,
 }
 
 impl<Ctx> SignedVote<Ctx>
 where
     Ctx: Context,
 {
-    pub fn new(vote: Ctx::Vote, address: Ctx::Address, signature: Signature<Ctx>) -> Self {
-        Self {
-            vote,
-            address,
-            signature,
-        }
+    pub fn new(vote: Ctx::Vote, signature: Signature<Ctx>) -> Self {
+        Self { vote, signature }
+    }
+
+    pub fn validator_address(&self) -> &Ctx::Address {
+        self.vote.validator_address()
     }
 }

Code/common/src/vote.rs

@@ -18,7 +18,7 @@ pub enum VoteType {
 /// include information about the validator signing it.
 pub trait Vote<Ctx>
 where
-    Self: Clone + Debug + PartialEq + Eq,
+    Self: Clone + Debug + Eq,
     Ctx: Context,
 {
     /// The round for which the vote is for.
@@ -32,4 +32,7 @@ where
 
     /// The type of vote.
     fn vote_type(&self) -> VoteType;
+
+    /// Address of the validator who issued this vote
+    fn validator_address(&self) -> &Ctx::Address;
 }

Code/consensus/src/executor.rs

@@ -1,5 +1,6 @@
 use std::collections::BTreeMap;
 
+use malachite_round::state_machine::RoundData;
 use secrecy::{ExposeSecret, Secret};
 
 use malachite_common::signature::Keypair;
@@ -32,7 +33,8 @@ where
     Ctx: Context,
 {
     height: Ctx::Height,
-    key: Secret<PrivateKey<Ctx>>,
+    private_key: Secret<PrivateKey<Ctx>>,
+    address: Ctx::Address,
     validator_set: Ctx::ValidatorSet,
     round: Round,
     votes: VoteKeeper<Ctx>,
@@ -57,7 +59,8 @@ where
     pub fn new(
         height: Ctx::Height,
         validator_set: Ctx::ValidatorSet,
-        key: PrivateKey<Ctx>,
+        private_key: PrivateKey<Ctx>,
+        address: Ctx::Address,
     ) -> Self {
         let votes = VoteKeeper::new(
             height.clone(),
@@ -67,7 +70,8 @@ where
 
         Self {
             height,
-            key: Secret::new(key),
+            private_key: Secret::new(private_key),
+            address,
             validator_set,
             round: Round::INITIAL,
             votes,
@@ -90,8 +94,9 @@ where
             RoundMessage::NewRound(round) => {
                 // TODO: check if we are the proposer
 
+                // XXX: Check if there is an existing state?
                 self.round_states
-                    .insert(round, RoundState::new(self.height.clone()).new_round(round));
+                    .insert(round, RoundState::default().new_round(round));
 
                 None
             }
@@ -102,14 +107,8 @@ where
             }
 
             RoundMessage::Vote(vote) => {
-                let address = self
-                    .validator_set
-                    .get_by_public_key(&self.key.expose_secret().verifying_key())?
-                    .address()
-                    .clone();
-
-                let signature = Ctx::sign_vote(&vote, self.key.expose_secret());
-                let signed_vote = SignedVote::new(vote, address, signature);
+                let signature = Ctx::sign_vote(&vote, self.private_key.expose_secret());
+                let signed_vote = SignedVote::new(vote, signature);
 
                 Some(Message::Vote(signed_vote))
             }
@@ -135,7 +134,7 @@ where
     fn apply_new_round(&mut self, round: Round) -> Option<RoundMessage<Ctx>> {
         let proposer = self.validator_set.get_proposer();
 
-        let event = if proposer.public_key() == &self.key.expose_secret().verifying_key() {
+        let event = if proposer.public_key() == &self.private_key.expose_secret().verifying_key() {
             let value = self.get_value();
             RoundEvent::NewRoundProposer(value)
         } else {
@@ -161,7 +160,7 @@ where
         }
 
         // Check that the proposal is for the current height and round
-        if round_state.height != proposal.height() || proposal.round() != self.round {
+        if self.height != proposal.height() || self.round != proposal.round() {
             return None;
         }
 
@@ -194,7 +193,9 @@ where
 
     fn apply_vote(&mut self, signed_vote: SignedVote<Ctx>) -> Option<RoundMessage<Ctx>> {
         // TODO: How to handle missing validator?
-        let validator = self.validator_set.get_by_address(&signed_vote.address)?;
+        let validator = self
+            .validator_set
+            .get_by_address(signed_vote.validator_address())?;
 
         if !Ctx::verify_signed_vote(&signed_vote, validator.public_key()) {
             // TODO: How to handle invalid votes?
@@ -231,16 +232,15 @@ where
     /// Apply the event, update the state.
     fn apply_event(&mut self, round: Round, event: RoundEvent<Ctx>) -> Option<RoundMessage<Ctx>> {
         // Get the round state, or create a new one
-        let round_state = self
-            .round_states
-            .remove(&round)
-            .unwrap_or_else(|| RoundState::new(self.height.clone()));
+        let round_state = self.round_states.remove(&round).unwrap_or_default();
+
+        let data = RoundData::new(round, &self.height, &self.address);
 
         // Apply the event to the round state machine
-        let transition = round_state.apply_event(round, event);
+        let transition = round_state.apply_event(&data, event);
 
         // Update state
-        self.round_states.insert(round, transition.state);
+        self.round_states.insert(round, transition.next_state);
 
         // Return message, if any
         transition.message

Code/round/src/lib.rs

@@ -14,3 +14,4 @@ pub mod events;
 pub mod message;
 pub mod state;
 pub mod state_machine;
+pub mod transition;

Code/round/src/message.rs

@@ -42,12 +42,12 @@ where
         Message::Proposal(Ctx::new_proposal(height, round, value, pol_round))
     }
 
-    pub fn prevote(round: Round, value_id: Option<ValueId<Ctx>>) -> Self {
-        Message::Vote(Ctx::new_prevote(round, value_id))
+    pub fn prevote(round: Round, value_id: Option<ValueId<Ctx>>, address: Ctx::Address) -> Self {
+        Message::Vote(Ctx::new_prevote(round, value_id, address))
     }
 
-    pub fn precommit(round: Round, value_id: Option<ValueId<Ctx>>) -> Self {
-        Message::Vote(Ctx::new_precommit(round, value_id))
+    pub fn precommit(round: Round, value_id: Option<ValueId<Ctx>>, address: Ctx::Address) -> Self {
+        Message::Vote(Ctx::new_precommit(round, value_id, address))
     }
 
     pub fn timeout(round: Round, step: TimeoutStep) -> Self {

Code/round/src/state.rs

@@ -1,5 +1,6 @@
 use crate::events::Event;
-use crate::state_machine::Transition;
+use crate::state_machine::RoundData;
+use crate::transition::Transition;
 
 use malachite_common::{Context, Round};
 
@@ -32,7 +33,6 @@ pub struct State<Ctx>
 where
     Ctx: Context,
 {
-    pub height: Ctx::Height,
     pub round: Round,
     pub step: Step,
     pub proposal: Option<Ctx::Proposal>,
@@ -46,7 +46,6 @@ where
 {
     fn clone(&self) -> Self {
         Self {
-            height: self.height.clone(),
             round: self.round,
             step: self.step,
             proposal: self.proposal.clone(),
@@ -60,9 +59,8 @@ impl<Ctx> State<Ctx>
 where
     Ctx: Context,
 {
-    pub fn new(height: Ctx::Height) -> Self {
+    pub fn new() -> Self {
         Self {
-            height,
             round: Round::INITIAL,
             step: Step::NewRound,
             proposal: None,
@@ -111,7 +109,16 @@ where
         }
     }
 
-    pub fn apply_event(self, round: Round, event: Event<Ctx>) -> Transition<Ctx> {
-        crate::state_machine::apply_event(self, round, event)
+    pub fn apply_event(self, data: &RoundData<Ctx>, event: Event<Ctx>) -> Transition<Ctx> {
+        crate::state_machine::apply_event(self, data, event)
+    }
+}
+
+impl<Ctx> Default for State<Ctx>
+where
+    Ctx: Context,
+{
+    fn default() -> Self {
+        Self::new()
     }
 }