diff --git a/chains/Schain.h b/chains/Schain.h index 840d6855..68dfa4db 100644 --- a/chains/Schain.h +++ b/chains/Schain.h @@ -133,11 +133,11 @@ class Schain : public Agent { ptr< SchainMessageThreadPool > consensusMessageThreadPool; + ptr< OracleResultAssemblyAgent > oracleResultAssemblyAgent; ptr optimizerAgent; - ptr< IO > io; // not null in regular mode @@ -177,7 +177,6 @@ class Schain : public Agent { ptr< NodeInfo > thisNodeInfo = nullptr; uint64_t verifyDaSigsPatchTimestampS = 0; - uint64_t fastConsensusPatchTimestampS = 1; // If a BlockError analyzer is added to the queue @@ -347,13 +346,9 @@ class Schain : public Agent { ptr< CryptoManager > getCryptoManager() const; - ptr< OptimizerAgent > getOptimizerAgent() const; - uint64_t getVerifyDaSigsPatchTimestampS() const; - uint64_t getFastConsensusTimestampS() const; - bool isInCreateBlock() const; @@ -393,11 +388,18 @@ class Schain : public Agent { bool verifyDASigsPatch( uint64_t _blockTimeStampSec ); - bool fastConsensusPatch( uint64_t _blockTimeStampSec ); - void updateInternalChainInfo( block_id _lastCommittedBlockID ); const ptr &getCatchupClientAgent() const; + ptr< OptimizerAgent > getOptimizerAgent() const; + + uint64_t getFastConsensusTimestampS() const; + + bool fastConsensusPatch( uint64_t _blockTimeStampSec ); + void setTimeStampValuesFromConfig(); + + ptr + calculateBooleanProposalVectorIfItsTimeToStartBinaryConsensus(const ptr &_daProof); };