Move broadcast bit validation to parse message

Author: michael-yxchen

monad-raptorcast/src/udp.rs

@@ -36,7 +36,7 @@ use monad_merkle::{MerkleHash, MerkleProof, MerkleTree};
 use monad_raptor::SOURCE_SYMBOLS_MIN;
 use monad_types::{Epoch, NodeId, Stake};
 use rand::seq::SliceRandom;
-use tracing::{debug, warn};
+use tracing::warn;
 
 use crate::{
     decoding::{DecoderCache, DecodingContext, TryDecodeError, TryDecodeStatus},
@@ -173,22 +173,16 @@ impl<ST: CertificateSignatureRecoverable> UdpState<ST> {
                 continue;
             }
 
-            let maybe_broadcast_mode = match (
-                parsed_message.broadcast,
-                parsed_message.secondary_broadcast,
-            ) {
-                (true, false) => Some(BroadcastMode::Primary),
-                (false, true) => Some(BroadcastMode::Secondary),
-                (false, false) => None,
-                (true, true) => {
-                    // invalid to have both primary and secondary broadcast bit set
-                    debug!(
-                        ?parsed_message.author,
-                        "Receiving invalid message with both broadcast and secondary broadcast bit set"
-                    );
-                    continue;
-                }
-            };
+            let maybe_broadcast_mode =
+                match (parsed_message.broadcast, parsed_message.secondary_broadcast) {
+                    (true, false) => Some(BroadcastMode::Primary),
+                    (false, true) => Some(BroadcastMode::Secondary),
+                    (false, false) => None,
+                    (true, true) => {
+                        // InvalidBroadcastBits
+                        unreachable!()
+                    }
+                };
 
             // Note: The check that parsed_message.author is valid is already
             // done in iterate_rebroadcast_peers(), but we want to drop invalid
@@ -890,6 +884,7 @@ pub enum MessageValidationError {
         max: u64,
         delta: i64,
     },
+    InvalidBroadcastBits,
 }
 
 /// - 65 bytes => Signature of sender over hash(rest of message up to merkle proof, concatenated with merkle root)
@@ -948,6 +943,10 @@ where
     let secondary_broadcast = (cursor_broadcast_tree_depth & (1 << 6)) != 0;
     let tree_depth = cursor_broadcast_tree_depth & 0b0000_1111; // bottom 4 bits
 
+    if broadcast && secondary_broadcast {
+        return Err(MessageValidationError::InvalidBroadcastBits);
+    }
+
     if !(MIN_MERKLE_TREE_DEPTH..=MAX_MERKLE_TREE_DEPTH).contains(&tree_depth) {
         return Err(MessageValidationError::InvalidTreeDepth);
     }