806 consensus improvements

libethereum/ClientBase.cpp

@@ -219,7 +219,7 @@ LocalisedLogEntries ClientBase::logs( LogFilter const& _f ) const {
     unsigned begin = min( bc().number() + 1, ( unsigned ) _f.latest() );
     unsigned end = min( bc().number(), min( begin, ( unsigned ) _f.earliest() ) );
 
-    if ( begin >= end && begin - end > bc().chainParams().getLogsBlocksLimit )
+    if ( begin >= end && begin - end > ( uint64_t ) bc().chainParams().getLogsBlocksLimit )
         BOOST_THROW_EXCEPTION( TooBigResponse() );
 
     // Handle pending transactions differently as they're not on the block chain.

libethereum/SchainPatch.cpp

@@ -20,14 +20,16 @@ SchainPatchEnum getEnumForPatchName( const std::string& _patchName ) {
         return SchainPatchEnum::ContractStorageZeroValuePatch;
     else if ( _patchName == "PushZeroPatch" )
         return SchainPatchEnum::PushZeroPatch;
-    else if ( _patchName == "VerifyDaSigsPatch" )
-        return SchainPatchEnum::VerifyDaSigsPatch;
     else if ( _patchName == "ContractStoragePatch" )
         return SchainPatchEnum::ContractStoragePatch;
     else if ( _patchName == "StorageDestructionPatch" )
         return SchainPatchEnum::StorageDestructionPatch;
     else if ( _patchName == "SkipInvalidTransactionsPatch" )
         return SchainPatchEnum::SkipInvalidTransactionsPatch;
+    else if ( _patchName == "VerifyDaSigsPatch" )
+        return SchainPatchEnum::VerifyDaSigsPatch;
+    else if ( _patchName == "FastConsensusPatch" )
+        return SchainPatchEnum::FastConsensusPatch;
     else if ( _patchName == "EIP1559TransactionsPatch" )
         return SchainPatchEnum::EIP1559TransactionsPatch;
     else if ( _patchName == "VerifyBlsSyncPatch" )
@@ -52,8 +54,6 @@ std::string getPatchNameForEnum( SchainPatchEnum _enumValue ) {
         return "ContractStorageZeroValuePatch";
     case SchainPatchEnum::PushZeroPatch:
         return "PushZeroPatch";
-    case SchainPatchEnum::VerifyDaSigsPatch:
-        return "VerifyDaSigsPatch";
     case SchainPatchEnum::ContractStoragePatch:
         return "ContractStoragePatch";
     case SchainPatchEnum::StorageDestructionPatch:
@@ -62,6 +62,10 @@ std::string getPatchNameForEnum( SchainPatchEnum _enumValue ) {
         return "SkipInvalidTransactionsPatch";
     case SchainPatchEnum::SelfdestructStorageLimitPatch:
         return "SelfdestructStorageLimitPatch";
+    case SchainPatchEnum::VerifyDaSigsPatch:
+        return "VerifyDaSigsPatch";
+    case SchainPatchEnum::FastConsensusPatch:
+        return "FastConsensusPatch";
     case SchainPatchEnum::EIP1559TransactionsPatch:
         return "EIP1559TransactionsPatch";
     case SchainPatchEnum::VerifyBlsSyncPatch:

libethereum/SchainPatchEnum.h

@@ -11,11 +11,12 @@ enum class SchainPatchEnum {
     CorrectForkInPowPatch,
     ContractStorageZeroValuePatch,
     PushZeroPatch,
-    VerifyDaSigsPatch,
     ContractStoragePatch,
     StorageDestructionPatch,
     SkipInvalidTransactionsPatch,
     SelfdestructStorageLimitPatch,
+    VerifyDaSigsPatch,
+    FastConsensusPatch,
     EIP1559TransactionsPatch,
     VerifyBlsSyncPatch,
     FlexibleDeploymentPatch,

libethereum/SkaleHost.cpp

@@ -81,6 +81,8 @@ std::unique_ptr< ConsensusInterface > DefaultConsensusFactory::create(
 
     patchTimeStamps["verifyDaSigsPatchTimestamp"] =
         m_client.chainParams().getPatchTimestamp( SchainPatchEnum::VerifyDaSigsPatch );
+    patchTimeStamps["fastConsensusPatchTimestamp"] =
+        m_client.chainParams().getPatchTimestamp( SchainPatchEnum::FastConsensusPatch );
     patchTimeStamps["verifyBlsSyncPatchTimestamp"] =
         m_client.chainParams().getPatchTimestamp( SchainPatchEnum::VerifyBlsSyncPatch );