Skip to content

Fix attempt #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nzpr wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Fix attempt #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
}

Expand Down Expand Up @@ -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 ++= {
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
5 changes: 4 additions & 1 deletion casper/src/main/scala/coop/rchain/casper/blocks/BlockReceiver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
}

Expand Down