Merge pull request #884 from ScorexFoundation/v5.0.9-RC

Release Candidate v5.0.9

Author: aslesarenko

.gitignore

@@ -49,4 +49,5 @@ spam-tests/
 .metals/
 .vscode/
 project/metals.sbt
-/project/project/
+/project/project/
+.bsp/

README.md

@@ -61,7 +61,7 @@ be verified before the spending transaction is added to the blockchain.
 To allow valid coin spending a
 [verifier](sigmastate/src/main/scala/sigmastate/interpreter/Interpreter.scala)
 is running the ErgoTree interpreter with the following three inputs:
-- a quarding proposition given by an ErgoTree 
+- a guarding proposition given by an ErgoTree 
 - a blockchain _context_ of the transaction being verified
 - a _proof_ (aka transaction signature) generated by a _prover_ 
 

build.sbt

@@ -5,7 +5,7 @@ organization := "org.scorexfoundation"
 
 name := "sigma-state"
 
-lazy val scala213 = "2.13.8"
+lazy val scala213 = "2.13.9"
 lazy val scala212 = "2.12.15"
 lazy val scala211 = "2.11.12"
 
@@ -257,9 +257,28 @@ lazy val interpreterJS = interpreter.js
       )
     )
 
+lazy val parsers = crossProject(JVMPlatform, JSPlatform)
+    .in(file("parsers"))
+    .dependsOn(interpreter % allConfigDependency)
+    .settings(libraryDefSettings)
+    .settings(libraryDependencies ++=
+        Seq(scorexUtil, fastparse) ++ circeDeps(scalaVersion.value)
+    )
+    .jvmSettings(
+      crossScalaSettings
+    )
+    .jsSettings(
+      crossScalaSettingsJS,
+      libraryDependencies ++= Seq(
+        "org.scala-js" %%% "scala-js-macrotask-executor" % "1.0.0"
+      ),
+      useYarn := true
+    )
+lazy val parsersJS = parsers.js
+    .enablePlugins(ScalaJSBundlerPlugin)
 
 lazy val sc = (project in file("sc"))
-  .dependsOn(graphir % allConfigDependency, interpreter.jvm % allConfigDependency)
+  .dependsOn(graphir % allConfigDependency, interpreter.jvm % allConfigDependency, parsers.jvm % allConfigDependency)
   .settings(libraryDefSettings)
   .settings(libraryDependencies ++=
       Seq(scorexUtil, fastparse) ++ circeDeps(scalaVersion.value)
@@ -268,7 +287,7 @@ lazy val sc = (project in file("sc"))
 
 lazy val sdk = crossProject(JVMPlatform, JSPlatform)
     .in(file("sdk"))
-    .dependsOn(corelib % allConfigDependency, interpreter % allConfigDependency)
+    .dependsOn(corelib % allConfigDependency, interpreter % allConfigDependency, parsers % allConfigDependency)
     .settings(commonSettings ++ testSettings2,
       commonDependenies2,
       testingDependencies2,
@@ -298,13 +317,13 @@ lazy val sdkJS = sdk.js
     )
 
 lazy val sigma = (project in file("."))
-  .aggregate(common.jvm, corelib.jvm, graphir, interpreter.jvm, sc, sdk.jvm)
+  .aggregate(common.jvm, corelib.jvm, graphir, interpreter.jvm, parsers.jvm, sc, sdk.jvm)
   .settings(libraryDefSettings, rootSettings)
   .settings(publish / aggregate := false)
   .settings(publishLocal / aggregate := false)
 
 lazy val aggregateCompile = ScopeFilter(
-  inProjects(common.jvm, corelib.jvm, graphir, interpreter.jvm, sc, sdk.jvm),
+  inProjects(common.jvm, corelib.jvm, graphir, interpreter.jvm, parsers.jvm, sc, sdk.jvm),
   inConfigurations(Compile))
 
 lazy val rootSettings = Seq(

docs/LangSpec.md

@@ -643,6 +643,10 @@ class Option[A] {
   /** Returns true if the option is an instance of Some(value), false otherwise. 
    */
   def isDefined: Boolean;
+
+  /** Returns true if the option is None, false otherwise. 
+   */
+  def isEmpty: Boolean;
 
   /** Returns the option's value if the option is nonempty, otherwise
     * return the result of evaluating `default`.

interpreter/shared/src/test/scala/sigmastate/serialization/generators/ObjectGenerators.scala

@@ -680,6 +680,12 @@ trait ObjectGenerators extends TypeGenerators
       ErgoTree.withoutSegregation))
   } yield treeBuilder(prop)
 
+  lazy val ergoTreeWithSegregationGen: Gen[ErgoTree] = for {
+    sigmaBoolean <- Gen.delay(sigmaBooleanGen)
+    propWithConstants <- Gen.delay(logicalExprTreeNodeGen(Seq(AND.apply, OR.apply, XorOf.apply)).map(_.toSigmaProp))
+    prop <- Gen.oneOf(propWithConstants, sigmaBoolean.toSigmaProp)
+  } yield ErgoTree.withSegregation(prop)
+
   def headerGen(stateRoot: AvlTree, parentId: Coll[Byte]): Gen[Header] = for {
     id <- modifierIdBytesGen
     version <- arbByte.arbitrary