Merge

skalenetwork · May 16, 2024 · 774f145 · 774f145
1 parent 0bb143f
commit 774f145
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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