fix(validations): fix mismatch in superblock validations

Author: aesedepece

data_structures/src/chain/mod.rs

@@ -36,8 +36,11 @@ use crate::{
         DataRequestError, EpochCalculationError, OutputPointerParseError, Secp256k1ConversionError,
         TransactionError,
     },
-    get_environment, get_protocol_version,
-    proto::{versioning::Versioned, ProtobufConvert},
+    get_environment,
+    proto::{
+        versioning::{ProtocolVersion, Versioned},
+        ProtobufConvert,
+    },
     superblock::SuperBlockState,
     transaction::{
         CommitTransaction, DRTransaction, DRTransactionBody, Memoized, MintTransaction,
@@ -669,7 +672,7 @@ impl Hashable for BlockHeader {
 impl MemoizedHashable for Block {
     fn hashable_bytes(&self) -> Vec<u8> {
         self.block_header
-            .to_versioned_pb_bytes(get_protocol_version())
+            .to_versioned_pb_bytes(ProtocolVersion::guess())
             .unwrap()
     }
 

data_structures/src/lib.rs

@@ -161,6 +161,6 @@ mod tests {
         // If this default changes before the transition to V2 is complete, almost everything will
         // break because data structures change schema and, serialization changes and hash
         // derivation breaks too
-        assert_eq!(get_protocol_version(), ProtocolVersion::V1_6);
+        assert_eq!(ProtocolVersion::guess(), ProtocolVersion::V1_6);
     }
 }

data_structures/src/proto/versioning.rs

@@ -6,6 +6,7 @@ use std::fmt::Formatter;
 use crate::proto::schema::witnet::SuperBlock;
 use crate::{
     chain::Hash,
+    get_protocol_version,
     proto::{
         schema::witnet::{
             Block, Block_BlockHeader, Block_BlockHeader_BlockMerkleRoots, Block_BlockTransactions,
@@ -30,6 +31,12 @@ pub enum ProtocolVersion {
     V2_0,
 }
 
+impl ProtocolVersion {
+    pub fn guess() -> Self {
+        get_protocol_version()
+    }
+}
+
 impl fmt::Display for ProtocolVersion {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         let s = match self {

data_structures/src/superblock.rs

@@ -17,6 +17,7 @@ use crate::{
         PublicKeyHash, SuperBlock, SuperBlockVote,
     },
     get_environment,
+    proto::versioning::{ProtocolVersion, VersionedHashable},
 };
 
 /// Possible result of SuperBlockState::add_vote
@@ -269,11 +270,15 @@ impl SuperBlockState {
 
             AddSuperBlockVote::DoubleVote
         } else {
-            let is_same_hash =
-                sbv.superblock_hash == self.current_superblock_beacon.hash_prev_block;
+            let theirs = sbv.superblock_hash;
+            let ours = self.current_superblock_beacon.hash_prev_block;
+            let votes_for_our_tip = theirs == ours;
+
+            log::debug!("Superblock vote comparison:\n(theirs): {theirs}\n(ours): {ours}");
+
             self.votes_mempool.insert_vote(sbv);
 
-            if is_same_hash {
+            if votes_for_our_tip {
                 AddSuperBlockVote::ValidWithSameHash
             } else {
                 AddSuperBlockVote::ValidButDifferentHash
@@ -699,7 +704,7 @@ pub fn mining_build_superblock(
             )
         }
         Some(last_block_header) => {
-            let last_block_hash = last_block_header.hash();
+            let last_block_hash = last_block_header.versioned_hash(ProtocolVersion::guess());
             let merkle_drs: Vec<Hash> = block_headers
                 .iter()
                 .map(|b| b.merkle_roots.dr_hash_merkle_root)

validations/src/validations.rs

@@ -29,7 +29,6 @@ use witnet_data_structures::{
         calculate_witness_reward_before_second_hard_fork, create_tally, DataRequestPool,
     },
     error::{BlockError, DataRequestError, TransactionError},
-    get_protocol_version,
     proto::versioning::ProtocolVersion,
     radon_report::{RadonReport, ReportContext},
     transaction::{
@@ -1945,7 +1944,7 @@ pub fn validate_block_transactions(
 
     // Nullify roots for legacy protocol version
     // TODO skip all staking logic if protocol version is legacy
-    let (st_root, ut_root) = match get_protocol_version() {
+    let (st_root, ut_root) = match ProtocolVersion::guess() {
         ProtocolVersion::V1_6 => Default::default(),
         _ => (Hash::from(st_mt.root()), Hash::from(ut_mt.root())),
     };