From 7779b8943835f5cfb836c92b3d49d772ea18736c Mon Sep 17 00:00:00 2001 From: nutzipper <1746367+nzpr@users.noreply.github.com> Date: Tue, 6 Sep 2022 09:32:06 +0300 Subject: [PATCH] Test --- build.sbt | 18 +++++++++++++----- .../rchain/casper/blocks/BlockReceiver.scala | 5 ++++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 16e90b5636d..19409c1c2f1 100644 --- a/build.sbt +++ b/build.sbt @@ -17,8 +17,8 @@ lazy val projectSettings = Seq( version := "0.1.0-SNAPSHOT", resolvers ++= Resolver.sonatypeOssRepos("releases") ++ - Resolver.sonatypeOssRepos("snapshots") ++ - Seq("jitpack" at "https://jitpack.io"), + Resolver.sonatypeOssRepos("snapshots") ++ + Seq("jitpack" at "https://jitpack.io"), wartremoverExcluded += sourceManaged.value, Compile / compile / wartremoverErrors ++= Warts.allBut( // those we want @@ -76,7 +76,7 @@ lazy val projectSettings = Seq( Seq( Compile / packageDoc / publishArtifact := false, packageDoc / publishArtifact := false, - Compile / doc / sources := Seq.empty, + Compile / doc / sources := Seq.empty ) } @@ -346,6 +346,14 @@ lazy val node = (project in file("node")) ExecCmd("CMD", "run") ) }, + Docker / dockerBuildCommand := Seq( + "docker", + "buildx", + "build", + ".", + "--platform=linux/amd64", //"--platform=linux/amd64,linux/arm64" + "--load" + ), // Replace unsupported character `+` Docker / version := { version.value.replace("+", "__") }, Docker / mappings ++= { @@ -379,7 +387,7 @@ lazy val node = (project in file("node")) rpmUrl := Some("https://rchain.coop"), rpmLicense := Some("Apache 2.0"), Rpm / packageArchitecture := "noarch", - Rpm / maintainerScripts := maintainerScriptsAppendFromFile((Rpm/maintainerScripts).value)( + Rpm / maintainerScripts := maintainerScriptsAppendFromFile((Rpm / maintainerScripts).value)( RpmConstants.Post -> (sourceDirectory.value / "rpm" / "scriptlets" / "post") ), rpmPrerequisites := Seq( @@ -410,7 +418,7 @@ lazy val rholang = (project in file("rholang")) "-Xfatal-warnings", "-Xlint:_,-missing-interpolator" // disable "possible missing interpolator" warning ), - Compile / packageDoc/ publishArtifact := false, + Compile / packageDoc / publishArtifact := false, packageDoc / publishArtifact := false, Compile / doc / sources := Seq.empty, libraryDependencies ++= commonDependencies ++ Seq( diff --git a/casper/src/main/scala/coop/rchain/casper/blocks/BlockReceiver.scala b/casper/src/main/scala/coop/rchain/casper/blocks/BlockReceiver.scala index bf6defc4048..7dd318d99d4 100644 --- a/casper/src/main/scala/coop/rchain/casper/blocks/BlockReceiver.scala +++ b/casper/src/main/scala/coop/rchain/casper/blocks/BlockReceiver.scala @@ -281,7 +281,10 @@ object BlockReceiver { next <- state.modify(_.finished(block.blockHash, parents)) // Send dependency free blocks to validation - _ <- next.toList.traverse_(receiverOutputQueue.enqueue1) + dag <- BlockDagStorage[F].getRepresentation + msgs <- next.toList.traverse(BlockStore[F].getUnsafe) + depFree = msgs.filter(_.justifications.forall(dag.contains)).map(_.blockHash) + _ <- depFree.traverse_(receiverOutputQueue.enqueue1) } yield () }