#1003 move bite2patch condition to BlockSignBroadcastMessage

Author: PropzSaladaz

protocols/blockconsensus/BlockConsensusAgent.cpp

@@ -213,27 +213,19 @@ void BlockConsensusAgent::decideBlock(
                        << to_string( _sChainIndex ) << ":BID:" + to_string( _blockId ) << ":STATS:|"
                        << _stats << "| Now signing block ..." );
 
-
-#ifdef BITE2
-        bool isBite2PatchEnabled = getSchain()->bite2Patch( getSchain()->getLastCommittedBlockTimeStamp().getS() );
-#endif
-
         auto msg = make_shared< BlockSignBroadcastMessage >(
             _blockId,
 #ifdef BITE
                 getSchain()->getNode()->getCurrentEpochId(),
 #endif
-            _sChainIndex, Time::getCurrentTimeMs(), *this
-#ifdef BITE2
-            , isBite2PatchEnabled
-#endif
-        );
+            _sChainIndex, Time::getCurrentTimeMs(), *this );
 
         auto signature = getSchain()->getNode()->getBlockSigShareDB()->checkAndSaveShareInMemory(
             msg->getSigShare(), getSchain()->getCryptoManager(), _sChainIndex );
 
 
 #ifdef BITE2
+        bool isBite2PatchEnabled = getSchain()->bite2Patch( getSchain()->getLastCommittedBlockTimeStamp().getS() );
         ptr<ThresholdSignature> reencryptionSignature;
         if ( isBite2PatchEnabled ) {
             reencryptionSignature = getSchain()->getNode()->getOffchainBlockSigShareDB()->checkAndSaveShareInMemory(

protocols/blockconsensus/BlockSignBroadcastMessage.cpp

@@ -58,9 +58,6 @@ BlockSignBroadcastMessage::BlockSignBroadcastMessage( block_id _blockID,
     epoch_id _epochID,
 #endif
     schain_index _blockProposerIndex, uint64_t _time, ProtocolInstance& _sourceProtocolInstance
-#ifdef BITE2
-    , bool _includeReencryptionSigShare
-#endif
 )
     : NetworkMessage( MSG_BLOCK_SIGN_BROADCAST, _blockID,
 #ifdef BITE
@@ -78,7 +75,8 @@ BlockSignBroadcastMessage::BlockSignBroadcastMessage( block_id _blockID,
     this->sigShareString = sigShare->toString();
 
 #ifdef BITE2
-    if ( _includeReencryptionSigShare ) {
+    bool isBite2PatchEnabled = schain->bite2Patch( schain->getLastCommittedBlockTimeStamp().getS() );
+    if ( isBite2PatchEnabled ) {
         // compute additional offchain signature using domain separation.
         // This signature will be used to derive a random value seen only by validators.
         auto& signatureDomain = blockconsensus::REENCRYPTION_RANDOM_DOMAIN;

protocols/blockconsensus/BlockSignBroadcastMessage.h

@@ -43,11 +43,7 @@ class BlockSignBroadcastMessage : public NetworkMessage {
     epoch_id _epochID,
 #endif
     schain_index _blockProposerIndex, uint64_t _time,
-        ProtocolInstance& _sourceProtocolInstance
-#ifdef BITE2
-        , bool _includeReencryptionSigShare = false
-#endif
-    );
+        ProtocolInstance& _sourceProtocolInstance );
 
     BlockSignBroadcastMessage( node_id _srcNodeID, block_id _blockID,
 #ifdef BITE