Merge branch 'master' into scalahub-patch-2

ergoplatform · Jun 28, 2019 · e3430c2 · e3430c2
2 parents 04ae509 + 399cef0
commit e3430c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...scala/org/ergoplatform/nodeView/history/storage/modifierprocessors/HeadersProcessor.scala b/...scala/org/ergoplatform/nodeView/history/storage/modifierprocessors/HeadersProcessor.scala
@@ -31,6 +31,8 @@ trait HeadersProcessor extends ToDownloadProcessor with ScorexLogging with Score
 
   protected val config: NodeConfigurationSettings
 
+  protected val chainSettings: ChainSettings
+
   val powScheme: AutolykosPowScheme
 
   //Maximum time in future block header may contain
@@ -266,8 +268,11 @@ trait HeadersProcessor extends ToDownloadProcessor with ScorexLogging with Score
         .validateEqualIds(hdrGenesisParent, header.parentId, Header.GenesisParentId)
         .validateOrSkipFlatten(hdrGenesisFromConfig, chainSettings.genesisId, (id: ModifierId) => id.equals(header.id))
         .validate(hdrGenesisHeight, header.height == GenesisHeight, header.toString)
+        .validateNoFailure(hdrPoW, powScheme.validate(header))
+        .validateEquals(hdrRequiredDifficulty, header.requiredDifficulty, chainSettings.initialDifficulty)
         .validateNot(alreadyApplied, historyStorage.contains(header.id), header.id.toString)
         .validate(hdrTooOld, fullBlockHeight < config.keepVersions, heightOf(header.parentId).toString)
+        .validate(hdrFutureTimestamp, header.timestamp - timeProvider.time() <= MaxTimeDrift, s"${header.timestamp} vs ${timeProvider.time()}")
         .result
     }
 

diff --git a/src/test/scala/org/ergoplatform/api/routes/InfoRoutesSpec.scala b/src/test/scala/org/ergoplatform/api/routes/InfoRoutesSpec.scala
@@ -39,7 +39,7 @@ class InfoRoutesSpec extends FlatSpec
   implicit val routeTimeout: RouteTestTimeout = RouteTestTimeout(15.seconds.dilated)
   val statsCollector: ActorRef = ErgoStatsCollectorRef(nodeViewRef, peerManagerRef, settings, fakeTimeProvider)
   val route: Route = InfoRoute(statsCollector, settings.scorexSettings.restApi, fakeTimeProvider).route
-  val requiredDifficulty = BigInt(320000000)
+  val requiredDifficulty = BigInt(1)
 
   override def beforeAll: Unit = {
     Await.ready(initDifficulty(requiredDifficulty), actorTimeout.duration)