Propose checks, id in prevote and precommit

Code/common/src/proposal.rs

@@ -1,16 +1,18 @@
-use crate::{Round, Value};
+use crate::{Height, Round, Value};
 
 /// A proposal for a value in a round
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Proposal {
+    pub height: Height,
     pub round: Round,
     pub value: Value,
     pub pol_round: Round,
 }
 
 impl Proposal {
-    pub fn new(round: Round, value: Value, pol_round: Round) -> Self {
+    pub fn new(height: Height, round: Round, value: Value, pol_round: Round) -> Self {
         Self {
+            height,
             round,
             value,
             pol_round,

Code/common/src/round.rs

@@ -27,7 +27,18 @@ impl Round {
     }
 
     pub fn is_defined(&self) -> bool {
-        matches!(self, Round::Some(_))
+        matches!(self, Round::Some(r) if *r >= 0)
+    }
+
+    pub fn is_nil(&self) -> bool {
+        matches!(self, Round::None)
+    }
+
+    pub fn is_valid(&self) -> bool {
+        match self {
+            Round::None => true,
+            Round::Some(r) => *r >= 0,
+        }
     }
 
     pub fn increment(&self) -> Round {

Code/common/src/value.rs

@@ -10,4 +10,21 @@ impl Value {
     pub fn as_u64(&self) -> u64 {
         self.0
     }
+
+    pub fn valid(&self) -> bool {
+        self.0 > 0
+    }
+
+    pub fn id(&self) -> ValueId {
+        ValueId(self.0)
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct ValueId(u64);
+
+impl ValueId {
+    pub fn new(id: u64) -> Self {
+        Self(id)
+    }
 }

Code/common/src/vote.rs

@@ -1,4 +1,4 @@
-use crate::{Address, Round, Value};
+use crate::{Address, Round, ValueId};
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum VoteType {
@@ -11,12 +11,12 @@ pub enum VoteType {
 pub struct Vote {
     pub typ: VoteType,
     pub round: Round,
-    pub value: Option<Value>,
+    pub value: Option<ValueId>,
     pub address: Address,
 }
 
 impl Vote {
-    pub fn new_prevote(round: Round, value: Option<Value>, address: Address) -> Self {
+    pub fn new_prevote(round: Round, value: Option<ValueId>, address: Address) -> Self {
         Self {
             typ: VoteType::Prevote,
             round,
@@ -25,7 +25,7 @@ impl Vote {
         }
     }
 
-    pub fn new_precommit(round: Round, value: Option<Value>, address: Address) -> Self {
+    pub fn new_precommit(round: Round, value: Option<ValueId>, address: Address) -> Self {
         Self {
             typ: VoteType::Precommit,
             round,

Code/consensus/src/executor.rs

@@ -1,16 +1,20 @@
 use std::collections::BTreeMap;
+use std::sync::Arc;
 
-use malachite_common::{Height, Proposal, Round, Timeout, TimeoutStep, ValidatorSet, Vote};
+use malachite_common::{
+    Height, Proposal, Round, Timeout, TimeoutStep, ValidatorSet, Vote, VoteType,
+};
 use malachite_round::events::Event as RoundEvent;
 use malachite_round::message::Message as RoundMessage;
 use malachite_round::state::State as RoundState;
+use malachite_vote::count::Threshold;
 use malachite_vote::keeper::VoteKeeper;
 
 #[derive(Clone, Debug)]
 pub struct Executor {
     height: Height,
     validator_set: ValidatorSet,
-
+    round: Round,
     votes: VoteKeeper,
     round_states: BTreeMap<Round, RoundState>,
 }
@@ -29,6 +33,7 @@ impl Executor {
         Self {
             height,
             validator_set,
+            round: Round::INITIAL,
             votes,
             round_states: BTreeMap::new(),
         }
@@ -73,9 +78,42 @@ impl Executor {
     fn apply_proposal(&mut self, proposal: Proposal) -> Option<RoundMessage> {
         // TODO: Check for invalid proposal
         let round = proposal.round;
-        let event = RoundEvent::Proposal(proposal);
+        let event = RoundEvent::Proposal(proposal.clone());
+        let round_state = self.round_states.get(&self.round).unwrap();
 
-        self.apply_event(round, event)
+        if round_state.proposal.is_some() {
+            return None;
+        }
+
+        if round_state.height != proposal.height || proposal.round != self.round {
+            return None;
+        }
+
+        if !proposal.pol_round.is_valid()
+            || proposal.pol_round.is_defined() && proposal.pol_round >= round_state.round
+        {
+            return None;
+        }
+
+        // TODO verify proposal signature (make some of these checks part of message validation)
+
+        match proposal.pol_round {
+            Round::None => {
+                // Is it possible to get +2/3 prevotes before the proposal?
+                // Do we wait for our own prevote to check the threshold?
+                self.apply_event(round, event)
+            }
+            Round::Some(_)
+                if self.votes.check_threshold(
+                    &proposal.pol_round,
+                    VoteType::Prevote,
+                    Threshold::Value(Arc::from(proposal.value.id())),
+                ) =>
+            {
+                self.apply_event(round, event)
+            }
+            _ => None,
+        }
     }
 
     fn apply_vote(&mut self, vote: Vote) -> Option<RoundMessage> {

Code/round/src/events.rs

@@ -1,6 +1,6 @@
 use malachite_common::Proposal;
 
-use crate::Value;
+use crate::{Value, ValueId};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Event {
@@ -10,9 +10,9 @@ pub enum Event {
     ProposalInvalid,         // Receive an invalid proposal.
     PolkaAny,                // Receive +2/3 prevotes for anything.
     PolkaNil,                // Receive +2/3 prevotes for nil.
-    PolkaValue(Value),       // Receive +2/3 prevotes for Value.
+    PolkaValue(ValueId),     // Receive +2/3 prevotes for Value.
     PrecommitAny,            // Receive +2/3 precommits for anything.
-    PrecommitValue(Value),   // Receive +2/3 precommits for Value.
+    PrecommitValue(ValueId), // Receive +2/3 precommits for Value.
     RoundSkip,               // Receive +1/3 votes from a higher round.
     TimeoutPropose,          // Timeout waiting for proposal.
     TimeoutPrevote,          // Timeout waiting for prevotes.

Code/round/src/message.rs

@@ -1,6 +1,6 @@
-use malachite_common::Address;
+use malachite_common::{Address, Height};
 
-use crate::{state::RoundValue, Proposal, Round, Timeout, TimeoutStep, Value, Vote};
+use crate::{state::RoundValue, Proposal, Round, Timeout, TimeoutStep, Value, ValueId, Vote};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Message {
@@ -12,20 +12,21 @@ pub enum Message {
 }
 
 impl Message {
-    pub fn proposal(round: Round, value: Value, pol_round: Round) -> Message {
+    pub fn proposal(height: Height, round: Round, value: Value, pol_round: Round) -> Message {
         Message::Proposal(Proposal {
+            height,
             round,
             value,
             pol_round,
         })
     }
 
-    pub fn prevote(round: Round, value: Option<Value>, address: Address) -> Message {
-        Message::Vote(Vote::new_prevote(round, value, address))
+    pub fn prevote(round: Round, value_id: Option<ValueId>, address: Address) -> Message {
+        Message::Vote(Vote::new_prevote(round, value_id, address))
     }
 
-    pub fn precommit(round: Round, value: Option<Value>, address: Address) -> Message {
-        Message::Vote(Vote::new_precommit(round, value, address))
+    pub fn precommit(round: Round, value_id: Option<ValueId>, address: Address) -> Message {
+        Message::Vote(Vote::new_precommit(round, value_id, address))
     }
 
     pub fn timeout(round: Round, step: TimeoutStep) -> Message {

Code/round/src/state.rs

@@ -1,6 +1,7 @@
 use crate::events::Event;
 use crate::state_machine::Transition;
 use crate::{Height, Round, Value};
+use malachite_common::Proposal;
 
 /// A value and its associated round
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -31,6 +32,7 @@ pub struct State {
     pub height: Height,
     pub round: Round,
     pub step: Step,
+    pub proposal: Option<Proposal>,
     pub locked: Option<RoundValue>,
     pub valid: Option<RoundValue>,
 }
@@ -41,6 +43,7 @@ impl State {
             height,
             round: Round::INITIAL,
             step: Step::NewRound,
+            proposal: None,
             locked: None,
             valid: None,
         }