From 774f145c52fdbe3d1bef5e6e4f3caf37544b0fea Mon Sep 17 00:00:00 2001
From: Stan Kladko <13399135+kladkogex@users.noreply.github.com>
Date: Thu, 16 May 2024 12:08:46 +0100
Subject: [PATCH] Merge

---
 chains/Schain.cpp | 5 +++--
 chains/Schain.h   | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/chains/Schain.cpp b/chains/Schain.cpp
index 8e468fd9..61ecdf69 100644
--- a/chains/Schain.cpp
+++ b/chains/Schain.cpp
@@ -434,7 +434,7 @@ bool Schain::verifyDASigsPatch( uint64_t _blockTimeStampS ) {
 }
 
 bool Schain::verifyBlsSyncPatch( uint64_t _blockTimeStampS ) {
-    return verifyBlsSyncPatchTimestampS != 0 && _blockTimeStampS >= verifyBlsSyncPatchTimestampS;
+    return verifyBlsSyncPatchTimestamp != 0 && _blockTimeStampS >= verifyBlsSyncPatchTimestamp;
 }
 
 void Schain::blockCommitArrived( block_id _committedBlockID, schain_index _proposerIndex,
@@ -1476,7 +1476,7 @@ uint64_t Schain::getVerifyDaSigsPatchTimeStamp() const {
 }
 
 uint64_t Schain::getVerifyBlsSyncPatchTimestampS() const {
-    return verifyBlsSyncPatchTimestampS;
+    return verifyBlsSyncPatchTimestamp;
 }
 
 
@@ -1528,4 +1528,5 @@ bool Schain::fastConsensusPatchEnabled(uint64_t _blockTimeStampSec ) {
 void Schain::setTimeStampValuesFromConfig() {
     SET_TIMESTAMP_FROM_CONFIG(verifyDaSigsPatchTimestamp)
     SET_TIMESTAMP_FROM_CONFIG(fastConsensusPatchTimestamp)
+    SET_TIMESTAMP_FROM_CONFIG(verifyBlsSyncPatchTimestamp)
 }
diff --git a/chains/Schain.h b/chains/Schain.h
index ff818f3b..24049b78 100644
--- a/chains/Schain.h
+++ b/chains/Schain.h
@@ -178,8 +178,7 @@ class Schain : public Agent {
 
     uint64_t verifyDaSigsPatchTimestamp = 0;
     uint64_t fastConsensusPatchTimestamp = 0;
-
-    uint64_t verifyBlsSyncPatchTimestampS = 0;
+    uint64_t verifyBlsSyncPatchTimestamp = 0;
 
     // If a BlockError analyzer is added to the queue
     // its analyze(CommittedBlock _block) function will be run on commit